summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofer Athlan-Guyot <sathlang@redhat.com>2017-03-24 12:11:33 +0100
committerSofer Athlan-Guyot <sathlang@redhat.com>2017-03-24 12:43:10 +0100
commitbfd485406d8f3847b1969579ebbdaa912c592a4a (patch)
treedd6148ac5996e35c8901d8bdc66b20ffde74cd96
parent8716d9f769dd17ef17fef7f0fdefaf0df6a7fe24 (diff)
N->O Upgrade, make sure all nova placement parameter properly set.
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>
-rw-r--r--puppet/major_upgrade_steps.j2.yaml9
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index 6f2dd684..5aba90e8 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -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 user_domain_name Default\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:
template: |
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 auth_url 'AUTH_URL'
- ROLE='ROLE_NAME'
params:
SERVICE_PASSWORD: { get_param: NovaPassword }
REGION_NAME: { get_param: KeystoneRegion }
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}}
- get_file: ../extraconfig/tasks/pacemaker_common_functions.sh
- get_file: ../extraconfig/tasks/run_puppet.sh