Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 70d1950)
Adding optional aci-opflex hiera data
authorRatnakar Kolli <rkolli@noironetworks.com>
Thu, 4 Aug 2016 19:32:22 +0000 (12:32 -0700)
committerRatnakar Kolli <rkolli@gmail.com>
Thu, 4 Aug 2016 19:38:20 +0000 (12:38 -0700)
This change adds an optional cisco_aci hiera data file during
ControllerExtraConfigPre and  ComputeExtraConfigPre

Change-Id: I158276f80c107e611817f6bc3b557dbf6dce19ee
Implements: blueprint aci-opflex

puppet/compute.yaml patch | blob | history
puppet/controller.yaml patch | blob | history

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 0e02916..435e8b0 100644 (file)
--- 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 (file)
--- 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: