Merge "Remove reference too puppet/services/ironic-pxe.yaml"

[apex-tripleo-heat-templates.git] / puppet / compute-role.yaml

diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index abfacd3..8a3c487 100644 (file)
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -157,6 +157,10 @@ parameters:
       Map of server hostnames to blacklist from any triggered
       deployments. If the value is 1, the server will be blacklisted. This
       parameter is generated from the parent template.
       Map of server hostnames to blacklist from any triggered
       deployments. If the value is 1, the server will be blacklisted. This
       parameter is generated from the parent template.

+  RoleParameters:
+    type: json
+    description: Role Specific Parameters
+    default: {}

 
 conditions:
   server_not_blacklisted:
 
 conditions:
   server_not_blacklisted:


@@ -381,6 +385,7 @@ resources:
     type: OS::TripleO::Compute::PreNetworkConfig
     properties:
       server: {get_resource: NovaCompute}
     type: OS::TripleO::Compute::PreNetworkConfig
     properties:
       server: {get_resource: NovaCompute}

+      RoleParameters: {get_param: RoleParameters}

 
   NetworkConfig:
     type: OS::TripleO::Compute::Net::SoftwareConfig
 
   NetworkConfig:
     type: OS::TripleO::Compute::Net::SoftwareConfig