openstack
/
instack-undercloud
Code Issues Proposed changes

Use /etc/novajoin instead of /etc/nova for cloud-init script 

The path was changed in RDO, so we need to reflect that.

Change-Id: I0c3303af79d0c703e9430801b695fe9ab9d3ccba
This commit is contained in:
Juan Antonio Osorio Robles 2017-06-12 15:44:27 +03:00
parent 65b6027526
commit 578c2a94a8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -816,7 +816,7 @@ nova::metadata::novajoin::auth::region: "%{hiera('keystone_region')}"
ipaclient::password: {{IPA_OTP}}
ipaclient::hostname: {{UNDERCLOUD_HOSTNAME}}
enable_novajoin: true
nova::api::vendordata_jsonfile_path: '/etc/nova/cloud-config-novajoin.json'
nova::api::vendordata_jsonfile_path: '/etc/novajoin/cloud-config-novajoin.json'
nova::api::vendordata_providers: ['StaticJSON', 'DynamicJSON']
nova::api::vendordata_dynamic_targets: ["join@http://{{LOCAL_IP}}:%{hiera('novajoin_listen_port')}/v1/"]
nova::api::vendordata_dynamic_failure_fatal: true