aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute-role.yaml
diff options
context:
space:
mode:
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}