diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-06-10 17:46:21 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-06-13 11:24:57 -0400 |
| commit | 9193a58d129716601091b2f3ceb7ca3960a694cb (patch) | |
| tree | 5f6cd3b7255bcf9d90ef5d21c5958d75683740ec /roles/openshift_master/templates/native-cluster | |
| parent | fea08b9ba213b69667e103ff9dfd4383218e9eac (diff) | |
| download | openshift-9193a58d129716601091b2f3ceb7ca3960a694cb.tar.gz openshift-9193a58d129716601091b2f3ceb7ca3960a694cb.tar.bz2 openshift-9193a58d129716601091b2f3ceb7ca3960a694cb.tar.xz openshift-9193a58d129716601091b2f3ceb7ca3960a694cb.zip | |
Add per-service environment variables.
Diffstat (limited to 'roles/openshift_master/templates/native-cluster')
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 | 6 | ||||
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index 02c22e374..ab560b1bd 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -9,6 +9,12 @@ AWS_ACCESS_KEY_ID={{ openshift.cloudprovider.aws.access_key }} AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% endif %} +{% if 'api_env_vars' in openshift.master -%} +{% for key, value in openshift.master.api_env_vars.items() -%} +{{ key }}={{ value }} +{% endfor -%} +{% endif -%} + # Proxy configuration # See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy {% if 'http_proxy' in openshift.common %} diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index 644640577..1a83b98e1 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -9,6 +9,12 @@ AWS_ACCESS_KEY_ID={{ openshift.cloudprovider.aws.access_key }} AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }} {% endif %} +{% if 'controllers_env_vars' in openshift.master -%} +{% for key, value in openshift.master.controllers_env_vars.items() -%} +{{ key }}={{ value }} +{% endfor -%} +{% endif -%} + # Proxy configuration # See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy {% if 'http_proxy' in openshift.common %} |