Merge "Ignore case for bootstrap node checks"

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

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 7acf2df..b7f4759 100644 (file)
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -161,6 +161,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:


@@ -394,11 +398,11 @@ resources:
     type: OS::TripleO::{{role}}::PreNetworkConfig
     properties:
       server: {get_resource: {{role}}}
     type: OS::TripleO::{{role}}::PreNetworkConfig
     properties:
       server: {get_resource: {{role}}}

+      RoleParameters: {get_param: RoleParameters}

 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: PreNetworkConfig
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
     depends_on: PreNetworkConfig

-    condition: server_not_blacklisted

     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}


@@ -407,6 +411,11 @@ resources:
       input_values:
         bridge_name: br-ex
         interface_name: {get_param: NeutronPublicInterface}
       input_values:
         bridge_name: br-ex
         interface_name: {get_param: NeutronPublicInterface}

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

 
   {{role}}UpgradeInitConfig:
     type: OS::Heat::SoftwareConfig
 
   {{role}}UpgradeInitConfig:
     type: OS::Heat::SoftwareConfig


@@ -425,22 +434,30 @@ resources:
   {{role}}UpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   {{role}}UpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       name: {{role}}UpgradeInitDeployment
       server: {get_resource: {{role}}}
       config: {get_resource: {{role}}UpgradeInitConfig}
     properties:
       name: {{role}}UpgradeInitDeployment
       server: {get_resource: {{role}}}
       config: {get_resource: {{role}}UpgradeInitConfig}

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

 
   {{role}}Deployment:
     type: OS::Heat::StructuredDeployment
     depends_on: {{role}}UpgradeInitDeployment
 
   {{role}}Deployment:
     type: OS::Heat::StructuredDeployment
     depends_on: {{role}}UpgradeInitDeployment

-    condition: server_not_blacklisted

     properties:
       name: {{role}}Deployment
       config: {get_resource: {{role}}Config}
       server: {get_resource: {{role}}}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
     properties:
       name: {{role}}Deployment
       config: {get_resource: {{role}}Config}
       server: {get_resource: {{role}}}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}

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

 
   {{role}}Config:
     type: OS::Heat::StructuredConfig
 
   {{role}}Config:
     type: OS::Heat::StructuredConfig


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

+          - config_step

           - {{role.lower()}}_extraconfig
           - extraconfig
           - service_names
           - {{role.lower()}}_extraconfig
           - extraconfig
           - service_names


@@ -480,6 +498,7 @@ 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]}

 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:


@@ -509,7 +528,6 @@ resources:
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       name: UpdateDeployment
       config: {get_resource: UpdateConfig}
     properties:
       name: UpdateDeployment
       config: {get_resource: UpdateConfig}


@@ -517,6 +535,11 @@ resources:
       input_values:
         update_identifier:
           get_param: UpdateIdentifier
       input_values:
         update_identifier:
           get_param: UpdateIdentifier

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

 
   SshHostPubKey:
     type: OS::TripleO::Ssh::HostPubKey
 
   SshHostPubKey:
     type: OS::TripleO::Ssh::HostPubKey