openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "novajoin: Fix cloud-config configuration path"

This commit is contained in:
Zuul 2018-08-09 12:31:38 +00:00 committed by Gerrit Code Review
parent bef12b6355 704d72ff3d
commit 46e0fbf6d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/novajoin.yaml
View File

@ -134,7 +134,7 @@ outputs:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovajoinNetwork]}
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']
# TODO(jaosorior): Add TLS support here. Novajoin is currently not
# accessed behind haproxy, but is accessed directly instead. For this