summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-08 15:36:03 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-08 15:36:03 -0400
commit2899072c99e9e5710c4e5f2efabfa5cc9fec55e2 (patch)
treef85c642ac758b5881579cd021c333bdc8253b3a8
parent51e390459d7eda90c44d9ffd7f1199a3590beac1 (diff)
parentf9a29d41eaafbc68821fbdd110687903ab646d43 (diff)
downloadopenshift-2899072c99e9e5710c4e5f2efabfa5cc9fec55e2.tar.gz
openshift-2899072c99e9e5710c4e5f2efabfa5cc9fec55e2.tar.bz2
openshift-2899072c99e9e5710c4e5f2efabfa5cc9fec55e2.tar.xz
openshift-2899072c99e9e5710c4e5f2efabfa5cc9fec55e2.zip
Merge pull request #1735 from smunilla/BZ1323918
a-o-i: Support openshift_image_tag
-rw-r--r--utils/src/ooinstall/openshift_ansible.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 28b157e8e..cf2ca51ca 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -130,7 +130,9 @@ def write_inventory_vars(base_inventory, multiple_masters, proxy):
if CFG.settings.get('master_routingconfig_subdomain', False):
base_inventory.write(
"openshift_master_default_subdomain={}\n".format(CFG.settings['master_routingconfig_subdomain']))
-
+ if CFG.settings.get('variant_version', None) == '3.1':
+ #base_inventory.write('openshift_image_tag=v{}\n'.format(CFG.settings.get('variant_version')))
+ base_inventory.write('openshift_image_tag=v{}\n'.format('3.1.1.6'))
def write_host(host, inventory, schedulable=None):