summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-08-18 10:46:23 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 13:49:10 +0200
commita22fbd327ab9decda9543d47c1ba375b9faecffd (patch)
tree8c1c0cb011980a015fd798612777eece523b5753 /roles/openshift_master
parent6f5fff8a542d544916427ce625fe46ec31fa76d3 (diff)
downloadopenshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.gz
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.bz2
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.xz
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.zip
GCE-support (more information in PR, README_GCE.md)
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index fa12005ab..96cc4d9af 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -8,6 +8,15 @@
- openshift_master_oauth_grant_method in openshift_master_valid_grant_methods
when: openshift_master_oauth_grant_method is defined
+- name: Displaying openshift_master_ha
+ debug: var=openshift_master_ha
+
+- name: openshift_master_cluster_password
+ debug: var=openshift_master_cluster_password
+
+- name: openshift.master.cluster_defer_ha
+ debug: var=openshift.master.cluster_defer_ha
+
- fail:
msg: "openshift_master_cluster_password must be set for multi-master installations"
when: openshift_master_ha | bool and not openshift.master.cluster_defer_ha | bool and openshift_master_cluster_password is not defined
@@ -23,7 +32,7 @@
api_port: "{{ openshift_master_api_port | default(None) }}"
api_url: "{{ openshift_master_api_url | default(None) }}"
api_use_ssl: "{{ openshift_master_api_use_ssl | default(None) }}"
- public_api_url: "{{ openshift_master_public_api_url | default(None) }}"
+ public_api_url: "{{ openshift_master_public_api_url | default('https://' ~ openshift.common.public_ip ~ ':8443') }}"
console_path: "{{ openshift_master_console_path | default(None) }}"
console_port: "{{ openshift_master_console_port | default(None) }}"
console_url: "{{ openshift_master_console_url | default(None) }}"