diff options
| author | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2016-02-01 14:38:16 -0800 |
|---|---|---|
| committer | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2016-02-01 14:38:16 -0800 |
| commit | 4e9186ace86e35f0af22e307d1f25e8b03fd1fe1 (patch) | |
| tree | a5cc43f840be417621cc79ae62ca498a1d3402e7 | |
| parent | ed605d488682e36126f4911c76c7485509751838 (diff) | |
| parent | c8cf5fca56f8ccaf034e2d5bfd30c750973dc572 (diff) | |
| download | openshift-4e9186ace86e35f0af22e307d1f25e8b03fd1fe1.tar.gz openshift-4e9186ace86e35f0af22e307d1f25e8b03fd1fe1.tar.bz2 openshift-4e9186ace86e35f0af22e307d1f25e8b03fd1fe1.tar.xz openshift-4e9186ace86e35f0af22e307d1f25e8b03fd1fe1.zip | |
Merge pull request #1303 from talset/s3_registry_clusterid
s3_registry no filter named 'lookup'
| -rw-r--r-- | playbooks/adhoc/s3_registry/s3_registry.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/adhoc/s3_registry/s3_registry.yml b/playbooks/adhoc/s3_registry/s3_registry.yml index 0814efae2..38ce92e92 100644 --- a/playbooks/adhoc/s3_registry/s3_registry.yml +++ b/playbooks/adhoc/s3_registry/s3_registry.yml @@ -14,7 +14,7 @@ aws_access_key: "{{ lookup('env', 'S3_ACCESS_KEY_ID') }}" aws_secret_key: "{{ lookup('env', 'S3_SECRET_ACCESS_KEY') }}" aws_bucket_name: "{{ aws_bucket | default(clusterid ~ '-docker') }}" - aws_bucket_region: "{{ aws_region | lookup('env', 'S3_REGION') | default('us-east-1') }}" + aws_bucket_region: "{{ aws_region | default(lookup('env', 'S3_REGION') | default('us-east-1', true)) }}" tasks: |