Merge pull request #293 from jprovaznik/subd

Make app_subdomain customizable

Author: lebauce

fragments/bastion-ansible.sh

@@ -58,6 +58,7 @@ function create_metadata_json() {
     "new_nodes": [$new_nodes],
     "deploy_router_or_registry": $deploy_router_or_registry,
     "domainname": "$domainname",
+    "app_subdomain": "${app_subdomain:-"cloudapps.$domainname"}",
     "lb_hostname": "$lb_hostname",
     "short_lb_hostname": "${lb_hostname%%.$domainname}",
     "deploy_router": $([ "$deploy_router" == "True" ] && echo true || echo false),

node.yaml

@@ -135,6 +135,12 @@ parameters:
       The DNS domain suffix. All VMs will be placed in this domain
     type: string
 
+  app_subdomain:
+    type: string
+    description: >
+      Default subdomain to use for exposed routes.
+    default: ''
+
   ansible_public_key:
     description: >
       The SSH public key that Ansible will use to access master and node hosts
@@ -631,6 +637,8 @@ resources:
         - name: all_infra_nodes
         - name: domainname
           default: {get_param: domain_name}
+        - name: app_subdomain
+          default: {get_param: app_subdomain}
         - name: ssh_user
           default: {get_param: ssh_user}
         - name: deployment_type

openshift.yaml

@@ -193,6 +193,12 @@ parameters:
     description: >
       The domain name that is going to be used as the base for all hostnames.
 
+  app_subdomain:
+    type: string
+    description: >
+      Default subdomain to use for exposed routes.
+    default: ''
+
   lb_hostname:
     type: string
     description: >
@@ -666,6 +672,7 @@ resources:
                 '%stackname%': {get_param: 'OS::stack_name'}
                 '%hostname%': {get_param: node_hostname}
           domain_name: {get_param: domain_name}
+          app_subdomain: {get_param: app_subdomain}
           ansible_public_key: {get_attr: [ansible_keys, public_key]}
           bastion_node: {get_attr: [bastion_host, resource.host]}
           skip_dns: {get_param: skip_dns}

templates/var/lib/ansible/group_vars/OSv3.yml

@@ -6,7 +6,7 @@ ansible_ssh_user: {{ssh_user}}
 ansible_sudo: true
 ansible_become: true
 deployment_type: {{deployment_type}} # deployment type valid values are origin, online and openshif-enterprise
-osm_default_subdomain: cloudapps.{{domainname}} # default subdomain to use for exposed routes
+openshift_master_default_subdomain: {{app_subdomain}} # default subdomain to use for exposed routes
 openshift_override_hostname_check: true
 openshift_use_openshift_sdn: {{openshift_use_openshift_sdn}}
 openshift_use_flannel: {{openshift_use_flannel}}