Merge "scenario002: containerize services for CI"

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

diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 9bf110d..6a03265 100644 (file)
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -104,8 +104,8 @@ parameters:
     default: 'localdomain'
     type: string
     description: >
     default: 'localdomain'
     type: string
     description: >

-      The DNS domain used for the hosts. This should match the dhcp_domain
-      configured in the Undercloud neutron. Defaults to localdomain.
+      The DNS domain used for the hosts. This must match the
+      overcloud_domain_name configured on the undercloud.

   ControllerServerMetadata:
     default: {}
     description: >
   ControllerServerMetadata:
     default: {}
     description: >


@@ -171,6 +171,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: {}

 
 parameter_groups:
 - label: deprecated
 
 parameter_groups:
 - label: deprecated


@@ -401,6 +405,7 @@ resources:
     type: OS::TripleO::Controller::PreNetworkConfig
     properties:
       server: {get_resource: Controller}
     type: OS::TripleO::Controller::PreNetworkConfig
     properties:
       server: {get_resource: Controller}

+      RoleParameters: {get_param: RoleParameters}

 
   NetworkConfig:
     type: OS::TripleO::Controller::Net::SoftwareConfig
 
   NetworkConfig:
     type: OS::TripleO::Controller::Net::SoftwareConfig


@@ -415,13 +420,16 @@ resources:
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment

-    condition: server_not_blacklisted

     depends_on: PreNetworkConfig
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}
       server: {get_resource: Controller}
     depends_on: PreNetworkConfig
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}
       server: {get_resource: Controller}

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

       input_values:
         bridge_name: br-ex
         interface_name: {get_param: NeutronPublicInterface}
       input_values:
         bridge_name: br-ex
         interface_name: {get_param: NeutronPublicInterface}


@@ -457,19 +465,27 @@ resources:
   # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
   ControllerUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
   # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
   ControllerUpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment

-    condition: server_not_blacklisted

     depends_on: NetworkDeployment
     properties:
       name: ControllerUpgradeInitDeployment
     depends_on: NetworkDeployment
     properties:
       name: ControllerUpgradeInitDeployment

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

       server: {get_resource: Controller}
       config: {get_resource: ControllerUpgradeInitConfig}
 
   ControllerDeployment:
     type: OS::TripleO::SoftwareDeployment
       server: {get_resource: Controller}
       config: {get_resource: ControllerUpgradeInitConfig}
 
   ControllerDeployment:
     type: OS::TripleO::SoftwareDeployment

-    condition: server_not_blacklisted

     depends_on: ControllerUpgradeInitDeployment
     properties:
       name: ControllerDeployment
     depends_on: ControllerUpgradeInitDeployment
     properties:
       name: ControllerDeployment

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

       config: {get_resource: ControllerConfig}
       server: {get_resource: Controller}
       input_values:
       config: {get_resource: ControllerConfig}
       server: {get_resource: Controller}
       input_values:


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

+          - config_step

           - controller_extraconfig
           - extraconfig
           - service_configs
           - controller_extraconfig
           - extraconfig
           - service_configs


@@ -529,6 +546,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]}

 
   # Hook for site-specific additional pre-deployment config, e.g extra hieradata
   ControllerExtraConfigPre:
 
   # Hook for site-specific additional pre-deployment config, e.g extra hieradata
   ControllerExtraConfigPre:


@@ -550,10 +568,14 @@ resources:
 
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment
 
   UpdateDeployment:
     type: OS::Heat::SoftwareDeployment

-    condition: server_not_blacklisted

     depends_on: NetworkDeployment
     properties:
       name: UpdateDeployment
     depends_on: NetworkDeployment
     properties:
       name: UpdateDeployment

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

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