X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller.yaml;h=c58c3906502b114d05bfcd6c89ef3042fc64180a;hb=444d3ba9028e8e4620db4cb90aa4805cbe7b4686;hp=388c06a29cc69110e26a3f86b3da10c149865d08;hpb=263ba3386f2f6446f5d65eb8ce21e46e657b4e94;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 388c06a2..c58c3906 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -240,6 +240,10 @@ parameters:
     default: 'REBUILD_PRESERVE_EPHEMERAL'
     description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
     type: string
+  InstanceNameTemplate:
+    default: 'instance-%08x'
+    description: Template string to be used to generate instance names
+    type: string
   KeyName:
     default: default
     description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -628,6 +632,12 @@ parameters:
   NodeIndex:
     type: number
     default: 0
+  CloudDomain:
+    default: ''
+    type: string
+    description: >
+      The DNS domain used for the hosts. This should match the dhcp_domain
+      configured in the Undercloud neutron. Defaults to localdomain.
 
 resources:
 
@@ -736,7 +746,7 @@ resources:
     properties:
       server: {get_resource: Controller}
 
-  # Hook for site-specific passing of private keys/certificates
+  # Resource for site-specific passing of private keys/certificates
   NodeTLSData:
     depends_on: NodeTLSCAData
     type: OS::TripleO::NodeTLSData
@@ -972,6 +982,7 @@ resources:
               - '@'
               - {get_param: MysqlVirtualIP}
               - '/nova'
+        instance_name_template: {get_param: InstanceNameTemplate}
         fencing_config: {get_param: FencingConfig}
         pcsd_password: {get_param: PcsdPassword}
         rabbit_username: {get_param: RabbitUserName}
@@ -1302,6 +1313,7 @@ resources:
                 nova::database_connection: {get_input: nova_dsn}
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
+                nova::api::instance_name_template: {get_input: instance_name_template}
                 nova::network::neutron::neutron_admin_password: {get_input: neutron_password}
                 nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
                 nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
@@ -1407,9 +1419,10 @@ outputs:
       Server's IP address and hostname in the /etc/hosts format
     value:
       str_replace:
-        template: IP HOST.localdomain HOST CLOUDNAME
+        template: IP HOST.DOMAIN HOST CLOUDNAME
         params:
           IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]}
+          DOMAIN: {get_param: CloudDomain}
           HOST: {get_attr: [Controller, name]}
           CLOUDNAME: {get_param: CloudName}
   nova_server_resource: