openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "[N->O] Fix wrong database connection for cell0 during upgrade."

Browse Source
This commit is contained in:
Jenkins 2017-03-30 11:51:22 +00:00 committed by Gerrit Code Review
commit 151a4c909d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ outputs:
- name: Setup cell_v2 (map cell0) - name: Setup cell_v2 (map cell0)
tags: step5 tags: step5
when: is_bootstrap_node 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) - name: Setup cell_v2 (create default cell)
tags: step5 tags: step5
when: is_bootstrap_node when: is_bootstrap_node

10
puppet/services/nova-base.yaml
View File

@ -151,6 +151,16 @@ outputs:
- {get_param: [EndpointMap, MysqlInternal, host]} - {get_param: [EndpointMap, MysqlInternal, host]}
- '/nova' - '/nova'
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' - '?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: nova::api_database_connection:
list_join: list_join:
- '' - ''