summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-20 09:34:46 +0000
committerGerrit Code Review <review@openstack.org>2017-04-20 09:34:46 +0000
commitaf1f3b3b746ef3b9e8d5bb234556c943ef4f03ed (patch)
tree12843dd297b679cad0c91ecf363864799193a6a1
parentef82c3a010cf6161f1da1020698dbd38257f5a12 (diff)
parent88a3168b3019f7c8232c14b95d4c7c6fb5080f03 (diff)
Merge "N->O upgrade, fix wrong parameters to nova placement."
-rw-r--r--puppet/major_upgrade_steps.j2.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index c0a0778c..28092773 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -51,10 +51,11 @@ 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"
+ - " crudini --set /etc/nova/nova.conf placement os_interface internal\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 os_region_name 'REGION_NAME'
crudini --set /etc/nova/nova.conf placement auth_url 'AUTH_URL'
params:
SERVICE_PASSWORD: { get_param: NovaPassword }