summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-27 17:46:47 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-27 17:46:47 +0100
commit8ca99ecc72bb60c128e846dbe33e38b3c2369e3c (patch)
treee784168c46239d55b27cfaefec6351a57a0f3c96
parent1becded19ae6ca07e9f1483d8dcc14258bfb0b23 (diff)
downloadands-8ca99ecc72bb60c128e846dbe33e38b3c2369e3c.tar.gz
ands-8ca99ecc72bb60c128e846dbe33e38b3c2369e3c.tar.bz2
ands-8ca99ecc72bb60c128e846dbe33e38b3c2369e3c.tar.xz
ands-8ca99ecc72bb60c128e846dbe33e38b3c2369e3c.zip
Update to OpenShift 3.7.1 and fix naming
-rw-r--r--group_vars/OSEv3.yml9
-rw-r--r--group_vars/all.yml2
2 files changed, 7 insertions, 4 deletions
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml
index 6a23094..1636c6d 100644
--- a/group_vars/OSEv3.yml
+++ b/group_vars/OSEv3.yml
@@ -1,9 +1,11 @@
### Deployment Type
deployment_type: "origin"
#openshift_release: "v1.5"
-openshift_release: "v3.7"
+openshift_release: "v3.7.1"
+#openshift_release: "v3.7"
#openshift_image_tag: "v1.5.0-rc.0"
-openshift_image_tag: "v3.7.1"
+#openshift_image_tag: "v3.7.1"
+#openshift_pkg_version=-3.7.0
#openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0"
#openshift_hosted_metrics_deployer_version: "v3.7.1"
@@ -19,7 +21,7 @@ os_firewall_use_firewalld: true
### Network & DNS configuration
openshift_master_cluster_hostname: "{{ ands_openshift_lb }}"
-#openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}"
+openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}"
openshift_master_default_subdomain: "{{ ands_openshift_subdomain }}"
openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}"
#openshift_portal_net:
@@ -103,4 +105,3 @@ openshift_install_examples: true
# Required for IPFailover
openshift_clock_enabled: true
-
diff --git a/group_vars/all.yml b/group_vars/all.yml
index aef2251..1a1d11f 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -2,3 +2,5 @@ ansible_ssh_user: root
ansible_ssh_private_key_file: /home/csa/.ssh/id_dsa
glusterfs_version: 312
+#This is required by OpenShift upgrade (may be something else)
+g_ssh_user: "{{ ansible_ssh_user }}"