summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 09:53:35 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 09:53:35 -0400
commit6cd266510dfa5423ae9af60ba191ff3aa1016100 (patch)
tree47d7ad52cb291a10c6f329dd00cc02eb56dd9ee9 /roles/openshift_common
parentbd48369d0f9baf9d9635b1cc2cb3ed23de1f9bf6 (diff)
parent590e5582ed22a491ed2a4701492083fa6521f047 (diff)
downloadopenshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.gz
openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.bz2
openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.xz
openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.zip
Merge pull request #1695 from brenton/bz1323123
Fixing bugs 1322788 and 1323123
Diffstat (limited to 'roles/openshift_common')
-rw-r--r--roles/openshift_common/defaults/main.yml1
-rw-r--r--roles/openshift_common/vars/main.yml1
2 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml
index 267c03605..e46af70c7 100644
--- a/roles/openshift_common/defaults/main.yml
+++ b/roles/openshift_common/defaults/main.yml
@@ -1,3 +1,4 @@
---
openshift_cluster_id: 'default'
openshift_debug_level: 2
+openshift_version: "{{ openshift_pkg_version | default('') }}"
diff --git a/roles/openshift_common/vars/main.yml b/roles/openshift_common/vars/main.yml
index b163f8aae..50816d319 100644
--- a/roles/openshift_common/vars/main.yml
+++ b/roles/openshift_common/vars/main.yml
@@ -5,4 +5,3 @@
# chains with the public zone (or the zone associated with the correct
# interfaces)
os_firewall_use_firewalld: False
-openshift_version: "{{ openshift_pkg_version | default('') }}"