diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 13:04:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 13:04:09 +0000 |
commit | 82f04ec310fe9d4f99e46077bb1c6e439187c7ed (patch) | |
tree | bc157391ff8d3fbc5a6c3de5bf66fcbeedea0242 /puppet/controller-puppet.yaml | |
parent | fa782c157cc0ce997e1957412e8f55b018519df7 (diff) | |
parent | e4c4c4068e817e30f46ba9ed475790f20343df18 (diff) |
Merge "Wire in Controller pre-deployment extraconfig"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r-- | puppet/controller-puppet.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 5a356bcc..f4eab68a 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -824,6 +824,7 @@ resources: - vip_data # provided by vip-config - '"%{::osfamily}"' - common + - cinder_netapp_data # Optionally provided by ControllerExtraConfigPre datafiles: common: raw_data: {get_file: hieradata/common.yaml} @@ -1041,6 +1042,13 @@ resources: tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface} enable_package_install: {get_input: enable_package_install} + # Hook for site-specific additional pre-deployment config, e.g extra hieradata + ControllerExtraConfigPre: + depends_on: ControllerDeployment + type: OS::TripleO::ControllerExtraConfigPre + properties: + server: {get_resource: Controller} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate @@ -1112,4 +1120,8 @@ outputs: IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]} config_identifier: description: identifier which changes if the controller configuration may need re-applying - value: {get_attr: [ControllerDeployment, deploy_stdout]} + value: + list_join: + - ',' + - - {get_attr: [ControllerDeployment, deploy_stdout]} + - {get_attr: [ControllerExtraConfigPre, deploy_stdout]} |