X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Frole.role.j2.yaml;h=587ff58d3ae9c5cb1ad4dcf2a3de205eff16732a;hb=ee86735b0c0b3d2cb90486347be285c7854a2aac;hp=5b419f80b5139ee082dc410743ff94f253c9a3f5;hpb=56bbb9f0cea35d7efe51d88fef48f1cefb26fe77;p=apex-tripleo-heat-templates.git

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 5b419f80..587ff58d 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -5,13 +5,17 @@ parameters:
     description: Flavor for the {{role}} node.
     default: baremetal
     type: string
+{% if disable_constraints is not defined %}
     constraints:
       - custom_constraint: nova.flavor
+{% endif %}
   {{role}}Image:
     type: string
     default: overcloud-full
+{% if disable_constraints is not defined %}
     constraints:
       - custom_constraint: glance.image
+{% endif %}
   ImageUpdatePolicy:
     default: 'REBUILD_PRESERVE_EPHEMERAL'
     description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
@@ -20,8 +24,10 @@ parameters:
     description: Name of an existing Nova key pair to enable SSH access to the instances
     type: string
     default: default
+{% if disable_constraints is not defined %}
     constraints:
       - custom_constraint: nova.keypair
+{% endif %}
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -72,6 +78,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain
@@ -249,41 +256,71 @@ resources:
   {{role}}Config:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          hierarchy:
-            - '"%{::uuid}"'
-            - heat_config_%{::deploy_config_name}
-            - {{role.lower()}}_extraconfig
-            - extraconfig
-            - service_names
-            - service_configs
-            - {{role.lower()}}
-            - bootstrap_node # provided by allNodesConfig
-            - all_nodes # provided by allNodesConfig
-            - vip_data # provided by allNodesConfig
-            - '"%{::osfamily}"'
-          merge_behavior: deeper
-          datafiles:
-            service_names:
-              mapped_data:
-                service_names: {get_param: ServiceNames}
-                sensu::subscriptions: {get_param: MonitoringSubscriptions}
-            service_configs:
-              mapped_data:
-                map_replace:
-                  - {get_param: ServiceConfigSettings}
-                  - values: {get_attr: [NetIpMap, net_ip_map]}
-            {{role.lower()}}_extraconfig:
-              mapped_data: {get_param: {{role}}ExtraConfig}
-            extraconfig:
-              mapped_data: {get_param: ExtraConfig}
-            {{role.lower()}}:
-              mapped_data:
-                tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
-                tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
-                tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
+        hierarchy:
+          - '"%{::uuid}"'
+          - heat_config_%{::deploy_config_name}
+          - {{role.lower()}}_extraconfig
+          - extraconfig
+          - service_names
+          - service_configs
+          - {{role.lower()}}
+          - bootstrap_node # provided by allNodesConfig
+          - all_nodes # provided by allNodesConfig
+          - vip_data # provided by allNodesConfig
+          - '"%{::osfamily}"'
+        merge_behavior: deeper
+        datafiles:
+          service_names:
+            service_names: {get_param: ServiceNames}
+            sensu::subscriptions: {get_param: MonitoringSubscriptions}
+          service_configs:
+            map_replace:
+              - {get_param: ServiceConfigSettings}
+              - values: {get_attr: [NetIpMap, net_ip_map]}
+          {{role.lower()}}_extraconfig: {get_param: {{role}}ExtraConfig}
+          extraconfig: {get_param: ExtraConfig}
+          {{role.lower()}}:
+            tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
+            tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
+            tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
+            fqdn_internal_api:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - internalapi
+                - {get_param: CloudDomain}
+            fqdn_storage:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - storage
+                - {get_param: CloudDomain}
+            fqdn_storage_mgmt:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - storagemgmt
+                - {get_param: CloudDomain}
+            fqdn_tenant:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - tenant
+                - {get_param: CloudDomain}
+            fqdn_management:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - management
+                - {get_param: CloudDomain}
+            fqdn_ctlplane:
+              list_join:
+              - '.'
+              - - {get_attr: [{{role}}, name]}
+                - ctlplane
+                - {get_param: CloudDomain}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData: