From 4638c80ce0d606023b8d1f51e24e392a582344da Mon Sep 17 00:00:00 2001 From: Ratnakar Kolli Date: Thu, 4 Aug 2016 12:32:22 -0700 Subject: 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 --- puppet/compute.yaml | 1 + puppet/controller.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 0e029162..435e8b04 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 b604ffca..efd1b567 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: -- cgit 1.2.3-korg