aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute-role.yaml
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-07-31 17:17:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-31 17:17:52 +0000
commit31ee4874f2d0f5e71a3b18752a8ac9b7c9133b4f (patch)
tree4b71ea6e5a3a564ec2d76b0ba3d8e856f3935dce /puppet/compute-role.yaml
parent11d7f03bde60873385e01901975cee06b98a59ac (diff)
parentbaaad6f6e5fb15f131858ac0f49e02ec336118bc (diff)
Merge "Add VPP and Honeycomb services (#104)"
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}