summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-01 22:57:19 -0400
committerGitHub <noreply@github.com>2017-08-01 22:57:19 -0400
commit4b8e77af233a13eef17aaab13a0f0ff06cb423f4 (patch)
treee0f5e55a1f4c04253f781558d51551ccac32addd /roles
parent1249a1f10252b8beec5105b2f53ce5d689f65ac1 (diff)
parentfbd7cc341390290bada33441e03a1964979f4e6b (diff)
downloadopenshift-4b8e77af233a13eef17aaab13a0f0ff06cb423f4.tar.gz
openshift-4b8e77af233a13eef17aaab13a0f0ff06cb423f4.tar.bz2
openshift-4b8e77af233a13eef17aaab13a0f0ff06cb423f4.tar.xz
openshift-4b8e77af233a13eef17aaab13a0f0ff06cb423f4.zip
Merge pull request #4949 from carlpett/patch-1
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j22
1 files changed, 1 insertions, 1 deletions
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 cdf2252f8..0adfd05b6 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
@@ -10,7 +10,7 @@ OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000
IMAGE_VERSION={{ openshift_image_tag }}
{% endif %}
-{% if openshift_cloudprovider_kind | default('') == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_access_key is defined %}
+{% if openshift_cloudprovider_kind | default('') == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined %}
AWS_ACCESS_KEY_ID={{ openshift_cloudprovider_aws_access_key }}
AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key }}
{% endif %}