summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-07-31 14:38:13 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-07-31 14:38:13 -0400
commit3c2893290640865cce15f6093a9ab2f11c294acd (patch)
treeacf0af709928428cc94299846c9c77016ce05ee0
parent5772c32ed6dac256b384e82fb912ac9349eec647 (diff)
parente944b14f3dd9ec0f97e74109a6dcbd019192c958 (diff)
downloadopenshift-3c2893290640865cce15f6093a9ab2f11c294acd.tar.gz
openshift-3c2893290640865cce15f6093a9ab2f11c294acd.tar.bz2
openshift-3c2893290640865cce15f6093a9ab2f11c294acd.tar.xz
openshift-3c2893290640865cce15f6093a9ab2f11c294acd.zip
Merge pull request #400 from detiber/addSubdomainConfig
Add support for setting routingConfig:subdomain
-rw-r--r--inventory/byo/hosts.example3
-rw-r--r--roles/openshift_master/tasks/main.yml1
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
3 files changed, 5 insertions, 1 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index 56f4da5a2..4c652d06e 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -54,6 +54,9 @@ deployment_type=enterprise
#openshift_master_cluster_public_hostname=openshift-ansible.test.example.com
#openshift_master_cluster_defer_ha=True
+# default subdomain to use for exposed routes
+#osm_default_subdomain=apps.test.example.com
+
# host group for masters
[masters]
ose3-master[1:3]-ansible.test.example.com
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 057daabf9..8d6c02e7f 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -53,6 +53,7 @@
oauth_grant_method: "{{ openshift_master_oauth_grant_method | default(None) }}"
sdn_cluster_network_cidr: "{{ osm_cluster_network_cidr | default(None) }}"
sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}"
+ default_subdomain: "{{ osm_default_subdomain | default(None) }}"
# TODO: These values need to be configurable
- name: Set dns OpenShift facts
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 5e46f8f69..01c0ea7e4 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -101,7 +101,7 @@ projectConfig:
mcsLabelsPerProject: 5
uidAllocatorRange: 1000000000-1999999999/10000
routingConfig:
- subdomain: router.default.local
+ subdomain: "{{ openshift.master.default_subdomain | default("") }}"
serviceAccountConfig:
managedNames:
- default