summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 17:04:35 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 17:04:35 -0500
commitb9a364c1025e1c3075ac2bc8e26f3ceb4d42cb2b (patch)
tree0703e7a45345f5d59be4889312c80e442e8be771
parentf8e0a3aded3bd96368971236e1e1c7a16d29929a (diff)
parentc97701b725244c0ca61fa714bc849f36829c9799 (diff)
downloadopenshift-b9a364c1025e1c3075ac2bc8e26f3ceb4d42cb2b.tar.gz
openshift-b9a364c1025e1c3075ac2bc8e26f3ceb4d42cb2b.tar.bz2
openshift-b9a364c1025e1c3075ac2bc8e26f3ceb4d42cb2b.tar.xz
openshift-b9a364c1025e1c3075ac2bc8e26f3ceb4d42cb2b.zip
Merge pull request #1495 from jstuever/rename_osm_default_subdomain
Rename variable to openshift_master_default_subdomain
-rw-r--r--inventory/byo/hosts.aep.example2
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
-rw-r--r--roles/openshift_master/tasks/main.yml2
4 files changed, 4 insertions, 4 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 2bb50e97c..637f13be6 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -132,7 +132,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#osm_api_server_args={'max-requests-inflight': ['400']}
# default subdomain to use for exposed routes
-#osm_default_subdomain=apps.test.example.com
+#openshift_master_default_subdomain=apps.test.example.com
# additional cors origins
#osm_custom_cors_origins=['foo.example.com', 'bar.example.com']
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index c529a46d5..c30f65f9f 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -137,7 +137,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#osm_api_server_args={'max-requests-inflight': ['400']}
# default subdomain to use for exposed routes
-#osm_default_subdomain=apps.test.example.com
+#openshift_master_default_subdomain=apps.test.example.com
# additional cors origins
#osm_custom_cors_origins=['foo.example.com', 'bar.example.com']
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index a40082dcb..b51569e68 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -133,7 +133,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#osm_api_server_args={'max-requests-inflight': ['400']}
# default subdomain to use for exposed routes
-#osm_default_subdomain=apps.test.example.com
+#openshift_master_default_subdomain=apps.test.example.com
# additional cors origins
#osm_custom_cors_origins=['foo.example.com', 'bar.example.com']
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index dd66eeebb..a37f5b4bb 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -70,7 +70,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) }}"
+ default_subdomain: "{{ openshift_master_default_subdomain | default(osm_default_subdomain) | default(None) }}"
custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
default_node_selector: "{{ osm_default_node_selector | default(None) }}"
project_request_message: "{{ osm_project_request_message | default(None) }}"