Merge pull request #276 from jprovaznik/lbfix

Unify loadbalancer stackname prefix

Author: lebauce

loadbalancer_dedicated.yaml

@@ -201,9 +201,8 @@ resources:
     properties:
       name:
         str_replace:
-          template: "%stackname%-%hostname%.%domainname%"
+          template: "%hostname%.%domainname%"
           params:
-            '%stackname%': {get_param: stack_name}
             '%hostname%': {get_param: hostname}
             '%domainname%': {get_param: domain_name}
       admin_user: {get_param: ssh_user}
@@ -375,18 +374,16 @@ outputs:
     description: URL of the OpenShift web console
     value:
       str_replace:
-        template: "https://%stackname%-%hostname%.%domainname%:8443/console/"
+        template: "https://%hostname%.%domainname%:8443/console/"
         params:
-          '%stackname%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}
 
   api_url:
     description: URL entrypoint to the OpenShift API
     value:
       str_replace:
-        template: "https://%stackname%-%hostname%.%domainname%:8443/"
+        template: "https://%hostname%.%domainname%:8443/"
         params:
-          '%stackname%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}

loadbalancer_neutron.yaml

@@ -190,18 +190,16 @@ outputs:
     description: URL of the OpenShift web console
     value:
       str_replace:
-        template: "https://%stackname%-%hostname%.%domainname%:8443/console/"
+        template: "https://%hostname%.%domainname%:8443/console/"
         params:
-          '%stackname%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}
 
   api_url:
     description: URL entrypoint to the OpenShift API
     value:
       str_replace:
-        template: "https://%stackname%-%hostname%.%domainname%:8443/"
+        template: "https://%hostname%.%domainname%:8443/"
         params:
-          '%stackname%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}

openshift.yaml

@@ -913,7 +913,12 @@ resources:
       sat6_activationkey: {get_param: sat6_activationkey}
       rhn_pool: {get_param: rhn_pool}
       extra_rhn_pools: {get_param: extra_rhn_pools}
-      hostname: {get_param: lb_hostname}
+      hostname:
+        str_replace:
+          template: "%stackname%-%hostname%"
+          params:
+            '%stackname%': {get_param: 'OS::stack_name'}
+            '%hostname%': {get_param: lb_hostname}
       domain_name: {get_param: domain_name}
       ansible_public_key: {get_attr: [ansible_keys, public_key]}
       dns_ip: {get_attr: [bastion_floating_ip, floating_ip_address]}