diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-04-19 11:26:45 +0200 |
|---|---|---|
| committer |   Marios Andreou <marios@redhat.com> | 2017-04-20 09:41:49 +0000 |
| commit | 6f75d76d42203657a2b39af5269d2a8f586e93bc (patch) | |
| tree | 55c7719016669e734005f05a5cc40e8f13cf8121 /puppet | |
| parent | 8c86ce42ce26299c3af8f54df52f04c7d6a9e34f (diff) | |
N->O upgrade, fix wrong parameters to nova placement.
According to [1] we need os_region_name, not region_name. Furthermore
the os_interface is configured as well. The hard check on this
parameter was introduced in ocata[2], explaining why the newton version
did not chock on it.
[1] https://docs.openstack.org/ocata/config-reference/compute/config-options.html
[2] https://github.com/openstack/nova/commit/d486315e0
Closes-Bug: #1684058
Change-Id: If6118bf03e832fe3fa5ea4fcb1b436afd2adf80a
(cherry picked from commit 88a3168b3019f7c8232c14b95d4c7c6fb5080f03)
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 } |