diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-25 22:08:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-25 22:08:33 +0000 |
| commit | 60f528f277bfb07e9107f60684d8f0f537f4c760 (patch) | |
| tree | a119e6798aad0b93f72be83c281a46d0b1a1104d | |
| parent | 68927e683c15a23f5f7186d486db4b7f067dff3a (diff) | |
| parent | 4638c80ce0d606023b8d1f51e24e392a582344da (diff) | |
Merge "Adding optional aci-opflex hiera data"
| -rw-r--r-- | puppet/compute.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index f9b3fc21..ad3a7230 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -271,6 +271,7 @@ resources: - nova_nuage_data # Optionally provided by ComputeExtraConfigPre - midonet_data # Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre + - cisco_aci_data # Optionally provided by ComputeExtraConfigPre merge_behavior: deeper datafiles: service_names: diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 2caa8b1e..a8dc5fba 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -501,6 +501,7 @@ resources: - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig + - cisco_aci_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_names: |