Update mysql url for cell0 in step3

When doing a TLS brown field deployment (ie. updating a previously
deployed system without internal TLS to using internal TLS), the
database endpoint stored in the db for the default cell and cell0
must be changed in step3.

Logic already exists in step 3 to change the default cell, and the
FFU group added logic to update cell0 in step 5.  We just need to
move that logic to step 3.

Note that this is not a problem in stein+ because we have already
added logic to set the db endpoint for both cells using
templated values for both cells in step 3.

Closes-Bug: 1838804

Change-Id: I7b5f6e0a2c8ba77fd575cf1a1003a1553f96efff
This commit is contained in:
Ade Lee 2019-08-02 14:23:17 -04:00
parent c16af43182
commit 9a6be5798f
2 changed files with 20 additions and 15 deletions

View File

@ -205,11 +205,25 @@ outputs:
- /var/lib/docker-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
nova_db_sync:
nova_api_ensure_cell0_database_url:
start_order: 3
image: *nova_api_image
net: host
detach: false
volumes:
list_concat:
- *nova_api_bootstrap_volumes
-
- /var/log/containers/nova:/var/log/nova
- /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
- /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
nova_db_sync:
start_order: 4
image: *nova_api_image
net: host
detach: false
volumes: *nova_api_bootstrap_volumes
user: root
command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage db sync'"
@ -258,20 +272,6 @@ outputs:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
step_5:
nova_api_ensure_cell0_database_url:
start_order: 1
image: *nova_api_image
net: host
detach: false
volumes:
list_concat:
- *nova_api_bootstrap_volumes
-
- /var/log/containers/nova:/var/log/nova
- /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
- /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
nova_online_migrations:
start_order: 2
image: *nova_api_image

View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes an issue whereby TLS Everywhere brownfield deployments were
timing out because the db entry for cell0 in the database was not
being updated in step 3. This entry is now updated in step 3.