diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 03:39:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 03:39:48 +0000 |
| commit | 073e43de7d907ec1b3f52c82aa9621d5af196897 (patch) | |
| tree | 62b0e9eb45c5a01c797c438bfadb47b447b9be0c /puppet | |
| parent | 33e53fd87784914d010411ec85d040623e4c2617 (diff) | |
| parent | 6f75d76d42203657a2b39af5269d2a8f586e93bc (diff) | |
Merge "N->O upgrade, fix wrong parameters to nova placement." into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/major_upgrade_steps.j2.yaml | 3 |
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 } |