aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-03-16 16:22:46 -0400
committerFeng Pan <fpan@redhat.com>2018-03-17 21:01:48 -0400
commitafa11d5946303191d2791b0751d34b9e7d66d9c5 (patch)
treeb94bd71bc925603bea62394d0fbc8256b3301f69 /puppet
parent01db62fd83df2af8b7d87280919a435ee43dc40f (diff)
Add vpp-router config to vpp ml2 environment file
Change-Id: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'puppet')
-rw-r--r--puppet/role.role.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index a3cbe85..6e34cf7 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -582,6 +582,7 @@ resources:
- cisco_n1kv_data # Optionally provided by Controller/ComputeExtraConfigPre
- midonet_data #Optionally provided by AllNodesExtraConfig
- cisco_aci_data # Optionally provided by Controller/ComputeExtraConfigPre
+ - common # Optionally provided by os-net-config
merge_behavior: deeper
datafiles:
service_names: