diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-03-16 16:22:46 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-04-12 14:08:27 +0000 |
| commit | 3df29834f02d09d4976ca42dbe04d494506848da (patch) | |
| tree | b94bd71bc925603bea62394d0fbc8256b3301f69 /puppet | |
| parent | 01db62fd83df2af8b7d87280919a435ee43dc40f (diff) | |
Add vpp-router config to vpp ml2 environment file
Change-Id: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit afa11d5946303191d2791b0751d34b9e7d66d9c5)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/role.role.j2.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index a3cbe851..6e34cf76 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: |