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 ff1f6d2..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


@@ -396,12 +401,15 @@ resources:
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: PreNetworkConfig
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: PreNetworkConfig

-    condition: server_not_blacklisted

     properties:
       name: NetworkDeployment
     properties:
       name: NetworkDeployment

+      actions:
+        if:
+          - server_not_blacklisted
+          - {get_param: NetworkDeploymentActions}
+          - []

       config: {get_resource: NetworkConfig}
       server: {get_resource: NovaCompute}
       config: {get_resource: NetworkConfig}
       server: {get_resource: NovaCompute}

-      actions: {get_param: NetworkDeploymentActions}

       input_values:
         bridge_name: {get_param: NeutronPhysicalBridge}
         interface_name: {get_param: NeutronPublicInterface}
       input_values:
         bridge_name: {get_param: NeutronPhysicalBridge}
         interface_name: {get_param: NeutronPublicInterface}


@@ -423,9 +431,13 @@ resources:
   NovaComputeUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   NovaComputeUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       name: NovaComputeUpgradeInitDeployment
     properties:
       name: NovaComputeUpgradeInitDeployment

+      actions:
+        if:
+          - server_not_blacklisted
+          - ['CREATE', 'UPDATE']
+          - []

       server: {get_resource: NovaCompute}
       config: {get_resource: NovaComputeUpgradeInitConfig}
 
       server: {get_resource: NovaCompute}
       config: {get_resource: NovaComputeUpgradeInitConfig}
 


@@ -437,6 +449,7 @@ resources:
         hierarchy:
           - '"%{::uuid}"'
           - heat_config_%{::deploy_config_name}
         hierarchy:
           - '"%{::uuid}"'
           - heat_config_%{::deploy_config_name}

+          - config_step

           - compute_extraconfig
           - extraconfig
           - service_names
           - compute_extraconfig
           - extraconfig
           - service_names


@@ -471,13 +484,18 @@ resources:
             fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
             fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
             fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
             fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
             fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
             fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}

+            fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}

 
   NovaComputeDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: NovaComputeUpgradeInitDeployment
 
   NovaComputeDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: NovaComputeUpgradeInitDeployment

-    condition: server_not_blacklisted

     properties:
       name: NovaComputeDeployment
     properties:
       name: NovaComputeDeployment

+      actions:
+        if:
+          - server_not_blacklisted
+          - ['CREATE', 'UPDATE']
+          - []

       config: {get_resource: NovaComputeConfig}
       server: {get_resource: NovaCompute}
       input_values:
       config: {get_resource: NovaComputeConfig}
       server: {get_resource: NovaCompute}
       input_values:


@@ -511,9 +529,13 @@ resources:
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       name: UpdateDeployment
     properties:
       name: UpdateDeployment

+      actions:
+        if:
+          - server_not_blacklisted
+          - ['CREATE', 'UPDATE']
+          - []

       config: {get_resource: UpdateConfig}
       server: {get_resource: NovaCompute}
       input_values:
       config: {get_resource: UpdateConfig}
       server: {get_resource: NovaCompute}
       input_values: