openstack/tripleo-heat-templates
Code Issues Proposed changes

N->O Upgrade, make sure all nova placement parameter properly set.

Browse Source 
The restart of openstack-nova-compute takes place before crudini set
the password, user_domain and project_name get set.

Change-Id: I57b54d5f59d5803d7ad4e399d598f699785a5825
Closes-Bug: #1675739
Co-Authored-By: Oliver Walsh <owalsh@redhat.com>
This commit is contained in:
Sofer Athlan-Guyot 2017-03-24 12:11:33 +01:00
parent 8716d9f769
commit bfd485406d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/major_upgrade_steps.j2.yaml
View File

@ -65,18 +65,21 @@ resources:
- " crudini --set /etc/nova/nova.conf placement project_domain_name Default\n\n" - " crudini --set /etc/nova/nova.conf placement project_domain_name Default\n\n"
- " crudini --set /etc/nova/nova.conf placement user_domain_name Default\n\n" - " crudini --set /etc/nova/nova.conf placement user_domain_name Default\n\n"
- " crudini --set /etc/nova/nova.conf placement project_name service\n\n" - " crudini --set /etc/nova/nova.conf placement project_name service\n\n"
- " systemctl restart openstack-nova-compute\n\n"
- "fi\n\n"
- str_replace: - str_replace:
template: | template: |
crudini --set /etc/nova/nova.conf placement password 'SERVICE_PASSWORD' crudini --set /etc/nova/nova.conf placement password 'SERVICE_PASSWORD'
crudini --set /etc/nova/nova.conf placement region_name 'REGION_NAME' crudini --set /etc/nova/nova.conf placement region_name 'REGION_NAME'
crudini --set /etc/nova/nova.conf placement auth_url 'AUTH_URL' crudini --set /etc/nova/nova.conf placement auth_url 'AUTH_URL'
ROLE='ROLE_NAME'
params: params:
SERVICE_PASSWORD: { get_param: NovaPassword } SERVICE_PASSWORD: { get_param: NovaPassword }
REGION_NAME: { get_param: KeystoneRegion } REGION_NAME: { get_param: KeystoneRegion }
AUTH_URL: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} AUTH_URL: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
- " systemctl restart openstack-nova-compute\n\n"
- "fi\n\n"
- str_replace:
template: |
ROLE='ROLE_NAME'
params:
ROLE_NAME: {{role.name}} ROLE_NAME: {{role.name}}
- get_file: ../extraconfig/tasks/pacemaker_common_functions.sh - get_file: ../extraconfig/tasks/pacemaker_common_functions.sh
- get_file: ../extraconfig/tasks/run_puppet.sh - get_file: ../extraconfig/tasks/run_puppet.sh