aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRatnakar Kolli <rkolli@noironetworks.com>2016-08-04 12:32:22 -0700
committerRatnakar Kolli <rkolli@gmail.com>2016-08-04 12:38:20 -0700
commit4638c80ce0d606023b8d1f51e24e392a582344da (patch)
tree5eb2c6d72cd36d1617797cba1c643b265fc4efe6
parent70d1950c9476b16d58418d55247f68774b72aac7 (diff)
Adding optional aci-opflex hiera data
This change adds an optional cisco_aci hiera data file during ControllerExtraConfigPre and ComputeExtraConfigPre Change-Id: I158276f80c107e611817f6bc3b557dbf6dce19ee Implements: blueprint aci-opflex
-rw-r--r--puppet/compute.yaml1
-rw-r--r--puppet/controller.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 0e02916..435e8b0 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -378,6 +378,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 b604ffc..efd1b56 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -646,6 +646,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: