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.

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

upgrade: add dashboard deployment (bp #4813) #4825

Merged
merged 3 commits into from Dec 11, 2019

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 5, 2019

This is an automated backport of pull request #4813 done by Mergify.io

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:
  • @Mergifyio rebase will rebase this PR
  • @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

when upgrading from RHCS 3, dashboard has obviously never been deployed
and it forces us to deploy it later manually.
This commit adds the dashboard deployment as part of the upgrade to
RHCS 4.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1779092

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 451c5ca)
In containerized context, containers aren't stopped early in the
sequence.
It means they aren't restarted after the upgrade because the task is
just checking the daemon status is started (eg: `state: started`).

This commit also removes the task which ensure services are started
because it's already done in the role ceph-iscsigw.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit c7708eb)
A recent change in ceph/ceph prevent from having username in the
password:

`Error EINVAL: Password cannot contain username.`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0756fa4)
@dsavineau
Copy link
Contributor

jenkins test centos-container-purge

2 similar comments
@dsavineau
Copy link
Contributor

jenkins test centos-container-purge

@guits
Copy link
Collaborator

guits commented Dec 5, 2019

jenkins test centos-container-purge

@dsavineau
Copy link
Contributor

jenkins test centos-container-update

6 similar comments
@guits
Copy link
Collaborator

guits commented Dec 6, 2019

jenkins test centos-container-update

@dsavineau
Copy link
Contributor

jenkins test centos-container-update

@guits
Copy link
Collaborator

guits commented Dec 9, 2019

jenkins test centos-container-update

@dsavineau
Copy link
Contributor

jenkins test centos-container-update

@guits
Copy link
Collaborator

guits commented Dec 9, 2019

jenkins test centos-container-update

@guits
Copy link
Collaborator

guits commented Dec 9, 2019

jenkins test centos-container-update

@guits
Copy link
Collaborator

guits commented Dec 10, 2019

Dec 09 18:06:20 iscsi-gw0 systemd[1]: Starting RBD Target API Service...
Dec 09 18:06:20 iscsi-gw0 docker[13322]: Error response from daemon: No such container: rbd-target-api
Dec 09 18:06:20 iscsi-gw0 docker[13331]: Error response from daemon: No such container: rbd-target-api
Dec 09 18:06:20 iscsi-gw0 systemd[1]: Started RBD Target API Service.
Dec 09 18:06:21 iscsi-gw0 docker[13337]: 2019-12-09 18:06:21  /opt/ceph-container/bin/entrypoint.sh: static: does not generate config
Dec 09 18:06:22 iscsi-gw0 docker[13337]: HEALTH_WARN Legacy BlueStore stats reporting detected on 4 OSD(s); 3 monitors have not enabled msgr2
Dec 09 18:06:22 iscsi-gw0 docker[13337]: 2019-12-09 18:06:22  /opt/ceph-container/bin/entrypoint.sh: SUCCESS
Dec 09 18:06:22 iscsi-gw0 docker[13337]: exec: PID 98: spawning /usr/bin/rbd-target-api
Dec 09 18:06:22 iscsi-gw0 docker[13337]: exec: Waiting 98 to quit
Dec 09 18:06:22 iscsi-gw0 docker[13337]: Traceback (most recent call last):
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/bin/rbd-target-api", line 2916, in <module>
Dec 09 18:06:22 iscsi-gw0 docker[13337]: config = Config(logger)
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/lib/python2.7/site-packages/ceph_iscsi_config/common.py", line 88, in __init__
Dec 09 18:06:22 iscsi-gw0 docker[13337]: self._upgrade_config()
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/lib/python2.7/site-packages/ceph_iscsi_config/common.py", line 189, in _upgrade_config
Dec 09 18:06:22 iscsi-gw0 docker[13337]: iqn = self.config['gateways']['iqn']
Dec 09 18:06:22 iscsi-gw0 docker[13337]: KeyError: 'iqn'
Dec 09 18:06:22 iscsi-gw0 docker[13337]: teardown: managing teardown after SIGCHLD
Dec 09 18:06:22 iscsi-gw0 docker[13337]: teardown: Waiting PID 98 to terminate
Dec 09 18:06:22 iscsi-gw0 docker[13337]: teardown: Process 98 is terminated
Dec 09 18:06:22 iscsi-gw0 docker[13337]: teardown: Bye Bye, container will die with return code 0

@guits
Copy link
Collaborator

guits commented Dec 10, 2019

jenkins test centos-container-update

@dsavineau
Copy link
Contributor

Dec 09 18:06:22 iscsi-gw0 docker[13337]: exec: PID 98: spawning /usr/bin/rbd-target-api
Dec 09 18:06:22 iscsi-gw0 docker[13337]: exec: Waiting 98 to quit
Dec 09 18:06:22 iscsi-gw0 docker[13337]: Traceback (most recent call last):
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/bin/rbd-target-api", line 2916, in <module>
Dec 09 18:06:22 iscsi-gw0 docker[13337]: config = Config(logger)
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/lib/python2.7/site-packages/ceph_iscsi_config/common.py", line 88, in __init__
Dec 09 18:06:22 iscsi-gw0 docker[13337]: self._upgrade_config()
Dec 09 18:06:22 iscsi-gw0 docker[13337]: File "/usr/lib/python2.7/site-packages/ceph_iscsi_config/common.py", line 189, in _upgrade_config
Dec 09 18:06:22 iscsi-gw0 docker[13337]: iqn = self.config['gateways']['iqn']
Dec 09 18:06:22 iscsi-gw0 docker[13337]: KeyError: 'iqn'

@mikechristie is this expected ? We don't have gateways defined in our scenarios so during the upgrade from ceph-iscsi 2 to 3 then there's no iqn key defined.
Do we need to do something else or is it a bug in the ceph-iscsi upgrade code that should use something like self.config['gateways'].get('iqn')
WDYT ?

@mikechristie
Copy link

It's not expected.

For this bug, it is as simple as adding a get(). However, let me do some more testing and code review to make sure we did not add other bugs like that, because based on this bug it looks like we did not test the case of upgrading when nothing is defined.

Will post a PR and make a new release for you guys.

@guits
Copy link
Collaborator

guits commented Dec 11, 2019

@dsavineau we figured out the failure in the CI and we know it's not related to this PR, I propose we merge this PR even though that job isn't passing then

@dsavineau dsavineau merged commit ba47878 into stable-4.0 Dec 11, 2019
@dsavineau dsavineau deleted the mergify/bp/stable-4.0/pr-4813 branch December 11, 2019 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants