Set openshift_master_cluster_hostname for external LB

This patch sets openshift_master_cluster_hostname and
openshift_master_cluster_public_hostname to point to
an external LB hostname. Because the external LB can not
be pre-set with list of master nodes before openshift-ansible
runs, external LB's IP is overriden temporarily to point to
the first master node during first openshift-ansible run.

External loadbalancer hostname now can (and should) be fully
quilified domain name.

Author: jprovaznik

README.adoc

@@ -297,7 +297,9 @@ openshift-on-openstack provides multiple options for setting up loadbalancing:
   for master nodes and OpenShift routers.
   This is suggested type for production.
   To select this type include `-e openshift-on-openstack/env_loadbalancer_external.yaml`
-  when creating the stack.
+  when creating the stack and also set `lb_hostname` parameter to point to the
+  loadbalancer's fully qualified domain name. Once stack creation is finished
+  you can set your external loadbalancer with the list of created master nodes.
 
 * Dedicated loadbalancer node - a dedicated node is created during stack
   creation and HAProxy loadbalancer is configured on it. Both console/API and

fragments/bastion-ansible.sh

@@ -41,14 +41,16 @@ function create_metadata_json() {
     "openshift_use_openshift_sdn": $([ "$openshift_sdn" == "openshift-sdn" ] && echo true || echo false),
     "openshift_use_flannel": $([ "$openshift_sdn" == "flannel" ] && echo true || echo false),
     "master_ha": $([ "$lb_type" != "none" -a $master_count -gt 1 ] && echo true || echo false),
+    "master_ip": "$master_ip",
     "openstack_cloud_provider": $openstack_cloud_provider,
     "os_username":"$os_username",
     "os_password":"$os_password",
     "os_auth_url":"$os_auth_url",
     "os_tenant_name":"$os_tenant_name",
     "os_region_name":"$os_region_name",
     "dedicated_lb": $([ "$lb_type" == "dedicated" ] && echo true || echo false),
-    "no_lb": $([ "$lb_type" == "none" -o "$lb_type" == "external" ] && echo true || echo false),
+    "no_lb": $([ "$lb_type" == "none" ] && echo true || echo false),
+    "external_lb": $([ "$lb_type" == "external" ] && echo true || echo false),
     "masters": ["$(echo "$all_master_nodes" | sed 's/ /","/g')"],
     "infra_nodes": ["$(echo "$all_infra_nodes" | sed 's/ /","/g')"],
     "infra_count": $infra_count,
@@ -57,6 +59,7 @@ function create_metadata_json() {
     "deploy_router_or_registry": $deploy_router_or_registry,
     "domainname": "$domainname",
     "lb_hostname": "$lb_hostname",
+    "short_lb_hostname": "${lb_hostname%%.$domainname}",
     "deploy_router": $([ "$deploy_router" == "True" ] && echo true || echo false),
     "deploy_registry": $([ "$deploy_registry" == "True" ] && echo true || echo false),
     "registry_volume_fs": "$registry_volume_fs",
@@ -101,7 +104,7 @@ function create_master_node_vars() {
     if [ "$lb_type" == "none" ]; then
         public_name="$1.$domainname"
     else
-        public_name="$lb_hostname.$domainname"
+        public_name="$lb_hostname"
     fi
 
     cat << EOF > /var/lib/ansible/host_vars/$1.$domainname.yml
@@ -138,7 +141,15 @@ function update_etc_hosts() {
     grep -q "$2" /etc/hosts || echo "$1 $2" >> /etc/hosts
 }
 
-update_etc_hosts "$lb_ip" "$lb_hostname.$domainname"
+if [ "$lb_type" == "external" ]; then
+    # for external loadbalancer override LB's IP to point to the first master
+    # node (because the LB can not be pre-set and working). This is done
+    # only for the initial run, for next scale up/down it's expected
+    # that the LB is already set.
+    [ -e ${ANSDIR}.deployed ] || update_etc_hosts "$master_ip" "$lb_hostname"
+else
+    update_etc_hosts "$lb_ip" "$lb_hostname"
+fi
 
 [ "$skip_ansible" == "True" ] && exit 0
 

infra.yaml

@@ -94,7 +94,7 @@ parameters:
     type: string
     constraints:
     - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+      description: Hostname must contain only characters [a-z0-9\-\.].
 
   domain_name:
     description: >

loadbalancer_dedicated.yaml

@@ -38,8 +38,8 @@ parameters:
       The load balancer hostname portion of the FQDN
     type: string
     constraints:
-    - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+    - allowed_pattern: '[a-z0-9\-\.]*'
+      description: Hostname must contain only characters [a-z0-9\-\.].
 
   domain_name:
     description: >
@@ -161,6 +161,10 @@ parameters:
   skip_dns:
     type: boolean
 
+  stack_name:
+    description: Top level stack name.
+    type: string
+
 resources:
   floating_ip_assoc:
     type: OS::Neutron::FloatingIPAssociation
@@ -204,8 +208,9 @@ resources:
     properties:
       name:
         str_replace:
-          template: "%hostname%.%domainname%"
+          template: "%stack_name%-%hostname%.%domainname%"
           params:
+            '%stack_name%': {get_param: stack_name}
             '%hostname%': {get_param: hostname}
             '%domainname%': {get_param: domain_name}
       admin_user: {get_param: ssh_user}
@@ -235,13 +240,19 @@ resources:
     type: OS::Heat::CloudConfig
     properties:
       cloud_config:
-        hostname: {get_param: hostname}
+        hostname:
+          str_replace:
+            template: "%stack_name%-%hostname%"
+            params:
+              '%stack_name%': {get_param: stack_name}
+              '%hostname%': {get_param: hostname}
         fqdn:
           str_replace:
-            template: "HOST.DOMAIN"
+            template: "%stack_name%-%hostname%.%domainname%"
             params:
-              HOST: {get_param: hostname}
-              DOMAIN: {get_param: domain_name}
+              '%stack_name%': {get_param: stack_name}
+              '%hostname%': {get_param: hostname}
+              '%domainname%': {get_param: domain_name}
 
   # Compile a set of standard configuration files to provide identity and access
   included_files:
@@ -352,10 +363,11 @@ resources:
         node_type: loadbalancer
         node_name:
           str_replace:
-            template: "HOST.DOMAIN"
+            template: "%stack_name%-%hostname%.%domainname%"
             params:
-              HOST: {get_param: hostname}
-              DOMAIN: {get_param: domain_name}
+              '%stack_name%': {get_param: stack_name}
+              '%hostname%': {get_param: hostname}
+              '%domainname%': {get_param: domain_name}
       config:
         get_resource: node_cleanup
       server:
@@ -377,16 +389,28 @@ outputs:
     description: URL of the OpenShift web console
     value:
       str_replace:
-        template: "https://%hostname%.%domainname%:8443/console/"
+        template: "https://%stack_name%-%hostname%.%domainname%:8443/console/"
         params:
+          '%stack_name%': {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://%hostname%.%domainname%:8443/"
+        template: "https://%stack_name%-%hostname%.%domainname%:8443/"
+        params:
+          '%stack_name%': {get_param: stack_name}
+          '%hostname%': {get_param: hostname}
+          '%domainname%': {get_param: domain_name}
+
+  hostname:
+    description: Loadbalancer hostname
+    value:
+      str_replace:
+        template: "%stack_name%-%hostname%.%domainname%"
         params:
+          '%stack_name%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}

loadbalancer_external.yaml

@@ -36,8 +36,12 @@ parameters:
       The load balancer hostname portion of the FQDN
     type: string
     constraints:
-    - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+    - allowed_pattern: '[a-z0-9\-\.]*'
+      description: Hostname must contain only characters [a-z0-9\-\.].
+
+  stack_name:
+    description: Top level stack name.
+    type: string
 
   domain_name:
     description: >
@@ -164,16 +168,18 @@ outputs:
     description: URL of the OpenShift web console
     value:
       str_replace:
-        template: "https://%hostname%.%domainname%:8443/console/"
+        template: "https://%hostname%:8443/console/"
         params:
-          '%hostname%': {get_param: master_hostname}
-          '%domainname%': {get_param: domain_name}
+          '%hostname%': {get_param: hostname}
 
   api_url:
     description: URL entrypoint to the OpenShift API
     value:
       str_replace:
-        template: "https://%hostname%.%domainname%:8443/"
+        template: "https://%hostname%:8443/"
         params:
-          '%hostname%': {get_param: master_hostname}
-          '%domainname%': {get_param: domain_name}
+          '%hostname%': {get_param: hostname}
+
+  hostname:
+    description: Loadbalancer hostname
+    value: {get_param: hostname}

loadbalancer_neutron.yaml

@@ -35,8 +35,12 @@ parameters:
       The load balancer hostname portion of the FQDN
     type: string
     constraints:
-    - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+    - allowed_pattern: '[a-z0-9\-\.]*'
+      description: Hostname must contain only characters [a-z0-9\-\.].
+
+  stack_name:
+    description: Top level stack name.
+    type: string
 
   domain_name:
     description: >
@@ -193,16 +197,28 @@ outputs:
     description: URL of the OpenShift web console
     value:
       str_replace:
-        template: "https://%hostname%.%domainname%:8443/console/"
+        template: "https://%stack_name%-%hostname%.%domainname%:8443/console/"
         params:
+          '%stack_name%': {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://%hostname%.%domainname%:8443/"
+        template: "https://%stack_name%-%hostname%.%domainname%:8443/"
+        params:
+          '%stack_name%': {get_param: stack_name}
+          '%hostname%': {get_param: hostname}
+          '%domainname%': {get_param: domain_name}
+
+  hostname:
+    description: Loadbalancer hostname
+    value:
+      str_replace:
+        template: "%stack_name%-%hostname%.%domainname%"
         params:
+          '%stack_name%': {get_param: stack_name}
           '%hostname%': {get_param: hostname}
           '%domainname%': {get_param: domain_name}

loadbalancer_none.yaml

@@ -35,6 +35,10 @@ parameters:
       The load balancer hostname portion of the FQDN
     type: string
 
+  stack_name:
+    description: Top level stack name.
+    type: string
+
   domain_name:
     description: >
       All VMs will be placed in this domain
@@ -142,6 +146,14 @@ parameters:
     type: number
     default: 4000
 
+  hostname:
+    description: >
+      The load balancer hostname portion of the FQDN
+    type: string
+    constraints:
+    - allowed_pattern: '[a-z0-9\-\.]*'
+      description: Hostname must contain only characters [a-z0-9\-\.].
+
   stack_name:
     type: string
     default: ''
@@ -173,3 +185,13 @@ outputs:
         params:
           '%hostname%': {get_param: master_hostname}
           '%domainname%': {get_param: domain_name}
+
+  hostname:
+    description: Loadbalancer hostname
+    value:
+      str_replace:
+        template: "%stack_name%-%hostname%.%domainname%"
+        params:
+          '%stack_name%': {get_param: stack_name}
+          '%hostname%': {get_param: hostname}
+          '%domainname%': {get_param: domain_name}

master.yaml

@@ -94,7 +94,7 @@ parameters:
     type: string
     constraints:
     - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+      description: Hostname must contain only characters [a-z0-9\-\.].
 
   domain_name:
     description: >

node.yaml

@@ -128,7 +128,7 @@ parameters:
     type: string
     constraints:
     - allowed_pattern: '[a-z0-9\-]*'
-      description: Hostname must contain only characters [a-z0-9\-].
+      description: Hostname must contain only characters [a-z0-9\-\.].
 
   domain_name:
     description: >
@@ -207,6 +207,12 @@ parameters:
     type: string
     default: ''
 
+  master_ip:
+    description: >
+      The IP address of the first master node (used instead of external LB during setup)
+    type: string
+    default: ''
+
   lb_hostname:
     description: >
       The hostname of the load balancer feeding the OpenShift master traffic
@@ -633,6 +639,8 @@ resources:
           default: {get_param: skip_dns}
         - name: lb_ip
           default: {get_param: lb_ip}
+        - name: master_ip
+          default: {get_param: master_ip}
         - name: lb_hostname
           default: {get_param: lb_hostname}
         - name: ldap_url

openshift.yaml

@@ -699,12 +699,8 @@ resources:
           loadbalancer_type: {get_param: loadbalancer_type}
           dns_forwarders: {get_param: dns_nameserver}
           lb_ip: {get_attr: [lb_floating_ip, floating_ip_address]}
-          lb_hostname:
-            str_replace:
-              template: "%stackname%-%hostname%"
-              params:
-                '%stackname%': {get_param: 'OS::stack_name'}
-                '%hostname%': {get_param: lb_hostname}
+          master_ip: {get_attr: [openshift_masters, resource.0.ip_address]}
+          lb_hostname: {get_attr: [loadbalancer, hostname]}
           router_vip: {get_attr: [ipfailover, router_vip]}
           skip_ansible: {get_param: skip_ansible}
           extra_openshift_ansible_params: {get_param: extra_openshift_ansible_params}
@@ -940,13 +936,9 @@ resources:
       sat6_activationkey: {get_param: sat6_activationkey}
       rhn_pool: {get_param: rhn_pool}
       extra_rhn_pools: {get_param: extra_rhn_pools}
-      hostname:
-        str_replace:
-          template: "%stackname%-%hostname%"
-          params:
-            '%stackname%': {get_param: 'OS::stack_name'}
-            '%hostname%': {get_param: lb_hostname}
+      hostname: {get_param: lb_hostname}
       domain_name: {get_param: domain_name}
+      stack_name: {get_param: 'OS::stack_name'}
       ansible_public_key: {get_attr: [ansible_keys, public_key]}
       dns_ip: {get_attr: [bastion_floating_ip, floating_ip_address]}
       fixed_subnet: {get_resource: fixed_subnet}