diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-06 14:04:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-06 14:04:46 +0000 |
| commit | 540df69624e37ba6d9ab8ebe9e2e0ac54a7acb49 (patch) | |
| tree | a8432581df8d49a9bcf562c5d7d12f2902e0f360 /puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | |
| parent | fd76fb23ba74443387c2d6d64120ac974836b085 (diff) | |
| parent | c5d10cd9fc94e6557417673190b73867a83cbb7b (diff) | |
Merge "Use the new hiera hook in all remaining templates"
Diffstat (limited to 'puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml')
| -rw-r--r-- | puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml index 7fe2a842..533c0ee9 100644 --- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml +++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml @@ -20,14 +20,13 @@ resources: NeutronBigswitchConfig: type: OS::Heat::StructuredConfig properties: - group: os-apply-config + group: hiera config: - hiera: - datafiles: - neutron_bigswitch_data: - mapped_data: - neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent} - neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp} + datafiles: + neutron_bigswitch_data: + mapped_data: + neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent} + neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp} NeutronBigswitchDeployment: type: OS::Heat::StructuredDeployment |