openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[FFU] Use output parameter instead of hiera lookup for cell creation" into stable/queens

This commit is contained in:
Zuul 2021-01-08 16:51:55 +00:00 committed by Gerrit Code Review
parent b6514f1382 42f4464019
commit 1f0c8e4b4f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/services/nova-api.yaml
View File

@ -430,7 +430,11 @@ outputs:
- name: Setup cell_v2 (create default cell)
# (owalsh) puppet-nova expects the cell name 'default'
# (owalsh) pass the db uri explicitly to avoid https://bugs.launchpad.net/tripleo/+bug/1662344
shell: nova-manage cell_v2 create_cell --name='default' --database_connection=$(hiera nova::database_connection)
shell:
str_replace:
template: nova-manage cell_v2 create_cell --name='default' --database_connection='CELL'
params:
CELL: {get_attr: [NovaApiBase, role_data, config_settings, "nova::database_connection"]}
register: nova_api_create_cell
failed_when: nova_api_create_cell.rc not in [0,2]
changed_when: nova_api_create_cell.rc == 0

12
puppet/services/nova-api.yaml
View File

@ -284,14 +284,22 @@ outputs:
when:
- step|int == 5
- is_bootstrap_node|bool
shell: nova-manage cell_v2 map_cell0 --database_connection=$(hiera nova::cell0_database_connection)
shell:
str_replace:
template: nova-manage cell_v2 map_cell0 --database_connection='CELL'
params:
CELL: {get_attr: [NovaBase, role_data, config_settings, "nova::cell0_database_connection"]}
- name: Setup cell_v2 (create default cell)
when:
- step|int == 5
- is_bootstrap_node|bool
# (owalsh) puppet-nova expects the cell name 'default'
# (owalsh) pass the db uri explicitly to avoid https://bugs.launchpad.net/tripleo/+bug/1662344
shell: nova-manage cell_v2 create_cell --name='default' --database_connection=$(hiera nova::database_connection)
shell:
str_replace:
template: nova-manage cell_v2 create_cell --name='default' --database_connection='CELL'
params:
CELL: {get_attr: [NovaBase, role_data, config_settings, "nova::database_connection"]}
register: nova_api_create_cell
failed_when: nova_api_create_cell.rc not in [0,2]
changed_when: nova_api_create_cell.rc == 0