diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-03-23 12:10:48 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-03-31 14:32:21 +0000 |
| commit | d99a06705489b1d63d72b0f2296d7236b3ccf7aa (patch) | |
| tree | a4f0bdba0f0be340a53b220933af8d2aac047aa4 /puppet/services | |
| parent | 51813d8b3407cb31d8d2c501c4d8b60f0b06bfe9 (diff) | |
[N->O] Fix wrong database connection for cell0 during upgrade.
During upgrade the cell0 database has the connection pointing to
mysql+pymysql://nova:c2cdagE8PyAbnpers3AD88Hge@10.0.0.19/nova_cell0?bind_address=10.0.0.20
where 10.0.0.20 was the ip of the bootstrap node. This makes the
nova-api fails on 2/3 node at the end of the
major-upgrade-composable-steps.yaml step.
We do have the right value in the hiera database so make sure we use
it for cell0 creation and not the nova.conf file which hasn't been
updated yet.
Change-Id: I09775206cb8fc5e15934f7e4475506a7fe17271e
Closes-Bug: #1675359
(cherry picked from commit c9c3813b6a0811a262068d0aab28d0bd535be3e1)
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/nova-api.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/nova-base.yaml | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index d5520522..678e09b6 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -225,7 +225,7 @@ outputs: - name: Setup cell_v2 (map cell0) tags: step5 when: is_bootstrap_node - command: nova-manage cell_v2 map_cell0 + shell: nova-manage cell_v2 map_cell0 --database_connection=$(hiera nova::cell0_database_connection) - name: Setup cell_v2 (create default cell) tags: step5 when: is_bootstrap_node diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 8100c9b1..7b568e9e 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -151,6 +151,16 @@ outputs: - {get_param: [EndpointMap, MysqlInternal, host]} - '/nova' - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + nova::cell0_database_connection: + list_join: + - '' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://nova:' + - {get_param: NovaPassword} + - '@' + - {get_param: [EndpointMap, MysqlInternal, host]} + - '/nova_cell0' + - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' nova::api_database_connection: list_join: - '' |