diff options
author | Jawed khelil <jkhelil@gmail.com> | 2016-11-02 16:05:48 +0100 |
---|---|---|
committer | Jawed khelil <jkhelil@gmail.com> | 2016-11-02 16:05:48 +0100 |
commit | 435346f46cee49bf2047d9492f40fc7c979024c6 (patch) | |
tree | 471e7556b9713e711df3822d7ec5cedd6765cdc3 /roles/openshift_master/templates | |
parent | c97858a6bc61251c02d2ca27172ebe87727b776a (diff) | |
download | openshift-435346f46cee49bf2047d9492f40fc7c979024c6.tar.gz openshift-435346f46cee49bf2047d9492f40fc7c979024c6.tar.bz2 openshift-435346f46cee49bf2047d9492f40fc7c979024c6.tar.xz openshift-435346f46cee49bf2047d9492f40fc7c979024c6.zip |
Prevent useless master by reworking template for master service enf file
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 26f0240ec..7aea89578 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -8,6 +8,11 @@ IMAGE_VERSION={{ openshift_image_tag }} AWS_ACCESS_KEY_ID={{ openshift_cloudprovider_aws_access_key }} AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key }} {% endif %} +{% if not (openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined) %} +{% for item in master_aws %} +{{ item }} +{% endfor %} +{% endif %} {% if 'api_env_vars' in openshift.master or 'controllers_env_vars' in openshift.master -%} {% for key, value in openshift.master.api_env_vars.items() | default([]) | union(openshift.master.controllers_env_vars.items() | default([])) -%} @@ -26,3 +31,8 @@ HTTPS_PROXY={{ openshift.common.https_proxy | default('')}} {% if 'no_proxy' in openshift.common %} NO_PROXY={{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} {% endif %} +{% if not ('https_proxy' in openshift.common or 'https_proxy' in openshift.common or 'no_proxy' in openshift.common) %} +{% for item in master_proxy %} +{{ item }} +{% endfor %} +{% endif %} |