Merge "Ignore case for bootstrap node checks"

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

diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 5ab6669..c35bb25 100644 (file)
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -139,6 +139,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:


@@ -372,16 +376,21 @@ resources:
     type: OS::TripleO::ObjectStorage::PreNetworkConfig
     properties:
       server: {get_resource: SwiftStorage}
     type: OS::TripleO::ObjectStorage::PreNetworkConfig
     properties:
       server: {get_resource: SwiftStorage}

+      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}
       server: {get_resource: SwiftStorage}
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}
       server: {get_resource: SwiftStorage}

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

 
   SwiftStorageUpgradeInitConfig:
     type: OS::Heat::SoftwareConfig
 
   SwiftStorageUpgradeInitConfig:
     type: OS::Heat::SoftwareConfig


@@ -400,11 +409,15 @@ resources:
   SwiftStorageUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   SwiftStorageUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       name: SwiftStorageUpgradeInitDeployment
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageUpgradeInitConfig}
     properties:
       name: SwiftStorageUpgradeInitDeployment
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageUpgradeInitConfig}

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

 
   SwiftStorageHieraConfig:
     type: OS::Heat::StructuredConfig
 
   SwiftStorageHieraConfig:
     type: OS::Heat::StructuredConfig


@@ -443,17 +456,22 @@ 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]}

 
   SwiftStorageHieraDeploy:
     type: OS::Heat::StructuredDeployment
     depends_on: SwiftStorageUpgradeInitDeployment
 
   SwiftStorageHieraDeploy:
     type: OS::Heat::StructuredDeployment
     depends_on: SwiftStorageUpgradeInitDeployment

-    condition: server_not_blacklisted

     properties:
       name: SwiftStorageHieraDeploy
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageHieraConfig}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
     properties:
       name: SwiftStorageHieraDeploy
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageHieraConfig}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}

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

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


@@ -476,13 +494,17 @@ resources:
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment

-    condition: server_not_blacklisted

     properties:
       config: {get_resource: UpdateConfig}
       server: {get_resource: SwiftStorage}
       input_values:
         update_identifier:
           get_param: UpdateIdentifier
     properties:
       config: {get_resource: UpdateConfig}
       server: {get_resource: SwiftStorage}
       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