Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NFS-Ganesha and iSCSI upgrade #1640

Merged
merged 16 commits into from
May 13, 2019
Merged

NFS-Ganesha and iSCSI upgrade #1640

merged 16 commits into from
May 13, 2019

Conversation

rjfd
Copy link
Contributor

@rjfd rjfd commented May 7, 2019

This PR implements several things besides the upgrades of iSCSI and NFS-Ganesha, here's the list:

  • NFS-Ganesha upgrade
  • iSCSI upgrade (lrbd -> ceph-iscsi)
  • Improved RGW dashboard configuration
  • Automatic Grafana dashboard configuration

NFS-Ganesha and iSCSI upgrades are part of stage 4. The upgrade process will detect if the upgrade is needed and performs the upgrade, otherwise it does nothing.

rjfd added 3 commits May 7, 2019 16:35
@rjfd
cli: fix step long descriptions format
4cb592e 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
cephprocesses: don't wait for rbd-target-api because it might not exist
df47f58 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
ganesha: keep generating cephx keys with same name as in ses5
7da1259 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd rjfd added the feature label May 7, 2019
@rjfd rjfd requested review from jan--f and jschmid1 May 7, 2019 15:52
@rjfd rjfd mentioned this pull request May 7, 2019
Closed
@rjfd
Copy link
Contributor Author

rjfd commented May 7, 2019

@ricardoasmarques can you review the iSCSI upgrade script in srv/salt/_modules/iscsi.py?

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch 4 times, most recently from f088bd3 to 1a59528 Compare May 7, 2019 16:38
@jschmid1
Copy link
Contributor

jschmid1 commented May 7, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 7, 2019

Commit 1a59528 is NOT OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/179/

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch from 1a59528 to 05153c1 Compare May 7, 2019 20:02
@rjfd
Copy link
Contributor Author

rjfd commented May 7, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 7, 2019

Commit 05153c1 is NOT OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/180/

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch 2 times, most recently from c49effd to 5dbbc27 Compare May 7, 2019 21:11
@rjfd
Copy link
Contributor Author

rjfd commented May 7, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 7, 2019

Commit 5dbbc27 is NOT OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/182/

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch from 5dbbc27 to db614af Compare May 7, 2019 22:36
@rjfd
Copy link
Contributor Author

rjfd commented May 7, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 7, 2019

Commit db614af is NOT OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/183/

@rjfd
Copy link
Contributor Author

rjfd commented May 7, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 8, 2019

Commit db614af is NOT OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/184/

@rjfd
Copy link
Contributor Author

rjfd commented May 8, 2019

@susebot run teuthology

@susebot
Copy link
Collaborator

susebot commented May 8, 2019

Commit db614af is OK for suite deepsea:tier2.
Check tests results in the Jenkins job: http://storage-ci.suse.de:8080/job/pr-deepsea/185/

@rjfd
Copy link
Contributor Author

rjfd commented May 8, 2019

@jschmid1 integration tests look good. I know that tests are always important but due to time constraints and because the benefit adding unit tests for this particular upgrade process is not that advantageous comparing to run integration tests and real upgrade tests, I did not add any new unit tests.

@rjfd
Copy link
Contributor Author

rjfd commented May 9, 2019

@smithfarm with the recent changes that I've pushed to this PR the iscsi suite will fail because it depends on the new ceph-iscsi package. Can you fix this somehow?

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch from 613c232 to c47fb09 Compare May 9, 2019 11:22
@smithfarm
Copy link
Contributor

@smithfarm with the recent changes that I've pushed to this PR the iscsi suite will fail because it depends on the new ceph-iscsi package. Can you fix this somehow?

@rjfd AFAIK the set of packages used by the DeepSea PR integration CI is fixed, and ATM @kshtsk may be the only one who knows how to update it (?)

@ricardoasmarques
Copy link
Contributor

@rjfd srv/salt/_modules/iscsi.py lgtm

@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch from ef96211 to acabf22 Compare May 10, 2019 10:08
@smithfarm
Copy link
Contributor

Testing this requires a newer version of the ceph-iscsi RPM than is in the repos currently used by the DeepSea master PR CI.

I ran the deepsea/tier2/igw test manually, and it passed: http://10.86.0.135:8081/ubuntu-2019-05-10_11:08:23-deepsea:tier2:igw-ses6---basic-openstack/

@rjfd rjfd mentioned this pull request May 10, 2019
Closed
4 tasks
@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch 2 times, most recently from 8e52560 to 5b0e802 Compare May 10, 2019 14:30
@rjfd
Copy link
Contributor Author

rjfd commented May 10, 2019

@jschmid1 I think this is ready to be merged

@jschmid1
Copy link
Contributor

https://github.com/SUSE/DeepSea/pull/1640/files#diff-fe001a31b195bc6e5c54315ec36ee883L32 is not correct still.

We discussed adding a mechanism to query the pillar in order to judge which igw service is used.

@rjfd
Copy link
Contributor Author

rjfd commented May 10, 2019

https://github.com/SUSE/DeepSea/pull/1640/files#diff-fe001a31b195bc6e5c54315ec36ee883L32 is not correct still.

We discussed adding a mechanism to query the pillar in order to judge which igw service is used.

It's fixed in this commit: 55c0a83

@jschmid1
Copy link
Contributor

https://github.com/SUSE/DeepSea/pull/1640/files#diff-fe001a31b195bc6e5c54315ec36ee883L32 is not correct still.
We discussed adding a mechanism to query the pillar in order to judge which igw service is used.

It's fixed in this commit: 55c0a83

Ah, there it is. looks good

@jschmid1 jschmid1 mentioned this pull request May 10, 2019
Open
rjfd added 13 commits May 10, 2019 16:08
@rjfd
ganesha: upgrade orchestration
2b4bdfd 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
tests: fix igw test case in cephprocesses module test
ffecc3b 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
Configure grafana in ceph-dashboard
048528b 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
rgw: allow the configuration of radosgw frontend port using the salt …
35a1500 
…pillar

Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
Improve RGW configuration in ceph-dasboard
f8948ba 
It sets the port and host.

Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
deepsea state module - state_apply_if implementation
84d727f 
This state module implements a function that allows to apply
a salt state if some condition is satisfied.
The condition can be over items stored in the pillar or grains,
or can be over the result of the execution of a salt module.

Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
select: sort minion list to maintain the order across calls
2bdf131 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
ganesha_upgrade: fix call to pkg.info_installed
d5b7e73 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
ganesha: use deepsea.state_apply_if to decide ganesha restarts
1b85f6b 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
iSCSI upgrade implementation
06e38ac 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
ipv6: fix iscsi configuration in ceph-dashboard
38031d2 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
iscsi: set ceph-iscsi logger level to WARNING
030e29b 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd
iscsi: only wait for iscsi gateway if it's ceph-iscsi
f67a9a0 
Signed-off-by: Ricardo Dias <rdias@suse.com>
@rjfd rjfd force-pushed the wip-iscsi-ganesha-upgrades branch from 31d2a3c to f67a9a0 Compare May 10, 2019 15:08
@smithfarm smithfarm merged commit 7e425c9 into SUSE:master May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theanalyst theanalyst theanalyst left review comments

@jschmid1 jschmid1 jschmid1 left review comments

@Martin-Weiss Martin-Weiss Martin-Weiss left review comments

@jan--f jan--f Awaiting requested review from jan--f

Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rjfd @jschmid1 @susebot @ricardoasmarques @smithfarm @theanalyst @Martin-Weiss