diff options
author | Tim Rozet <trozet@redhat.com> | 2017-07-31 17:17:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-31 17:17:52 +0000 |
commit | 31ee4874f2d0f5e71a3b18752a8ac9b7c9133b4f (patch) | |
tree | 4b71ea6e5a3a564ec2d76b0ba3d8e856f3935dce /puppet/controller-role.yaml | |
parent | 11d7f03bde60873385e01901975cee06b98a59ac (diff) | |
parent | baaad6f6e5fb15f131858ac0f49e02ec336118bc (diff) |
Merge "Add VPP and Honeycomb services (#104)"
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 5593d15e..badab487 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -472,6 +472,7 @@ resources: - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - cisco_aci_data # Optionally provided by ControllerExtraConfigPre + - common # provided by os-net-config merge_behavior: deeper datafiles: service_names: |