aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute-role.yaml
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-07-19 12:40:59 -0400
committerFeng Pan <fpan@redhat.com>2017-07-30 13:26:48 -0400
commitbaaad6f6e5fb15f131858ac0f49e02ec336118bc (patch)
treec5a233db47dfb3875a7193285f315eb7850b6f00 /puppet/compute-role.yaml
parent747e941a9a36a21411449248d7cca712e1894737 (diff)
Add VPP and Honeycomb services (#104)
- Add VPP and honeycomb service - Add NeutronOverlayIPVersion setting for IPv6 vxlan tunnel endpoint Change-Id: If11092e6581445a70e63c8f6c48518698b3cc8fc Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'puppet/compute-role.yaml')
-rw-r--r--puppet/compute-role.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 45794c12..fff5c01c 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -426,6 +426,7 @@ resources:
- midonet_data # Optionally provided by AllNodesExtraConfig
- neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre
- cisco_aci_data # Optionally provided by ComputeExtraConfigPre
+ - common # provided by os-net-config
merge_behavior: deeper
datafiles:
service_names:
@@ -600,4 +601,4 @@ CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST HOSTSSHPUBKEY"
nova_server_resource:
description: Heat resource handle for the Nova compute server
value:
- {get_resource: NovaCompute} \ No newline at end of file
+ {get_resource: NovaCompute}