summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-05-10 09:01:50 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-05-10 09:13:03 -0400
commit29c2124569e5d64d16b636f741654bd7d98da393 (patch)
tree617a5284e16589e7d44ab1dccaf96a9abfea94b1
parent2356e549bae059a1d3e9336102115f13163ffd31 (diff)
downloadopenshift-29c2124569e5d64d16b636f741654bd7d98da393.tar.gz
openshift-29c2124569e5d64d16b636f741654bd7d98da393.tar.bz2
openshift-29c2124569e5d64d16b636f741654bd7d98da393.tar.xz
openshift-29c2124569e5d64d16b636f741654bd7d98da393.zip
a-o-i: Write proxy variables
Write the proper variables for http(s) and proxy excludes to the ansible inventory.
-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