summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-10 17:19:11 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-10 17:19:11 -0400
commit45e5e99b1d8d155a9680f1ac00ac5fb8cfab8bec (patch)
tree0d4c9eca1bf7eff6653b369d78a837ac0a877b73 /utils/src
parent0df86f3a6aa585cf7582c2c8d6125f8a79cc295e (diff)
parent29c2124569e5d64d16b636f741654bd7d98da393 (diff)
downloadopenshift-45e5e99b1d8d155a9680f1ac00ac5fb8cfab8bec.tar.gz
openshift-45e5e99b1d8d155a9680f1ac00ac5fb8cfab8bec.tar.bz2
openshift-45e5e99b1d8d155a9680f1ac00ac5fb8cfab8bec.tar.xz
openshift-45e5e99b1d8d155a9680f1ac00ac5fb8cfab8bec.zip
Merge pull request #1873 from smunilla/BZ1331236
a-o-i: Write proxy variables
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/openshift_ansible.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 5ace63918..97aee0b53 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -135,6 +135,16 @@ def write_inventory_vars(base_inventory, multiple_masters, proxy):
#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'))
+ if CFG.settings.get('openshift_http_proxy', ''):
+ base_inventory.write("openshift_http_proxy={}\n".format(
+ CFG.settings['openshift_http_proxy']))
+ if CFG.settings.get('openshift_https_proxy', ''):
+ base_inventory.write("openshift_https_proxy={}\n".format(
+ CFG.settings['openshift_https_proxy']))
+ if CFG.settings.get('openshift_no_proxy', ''):
+ base_inventory.write("openshift_no_proxy={}\n".format(
+ CFG.settings['openshift_no_proxy']))
+
def write_host(host, inventory, schedulable=None):
global CFG