diff options
| author | talset <florian.lambert@enovance.com> | 2016-01-29 10:02:53 +0100 |
|---|---|---|
| committer | talset <florian.lambert@enovance.com> | 2016-01-29 13:59:54 +0100 |
| commit | c8cf5fca56f8ccaf034e2d5bfd30c750973dc572 (patch) | |
| tree | 8ae021bfad16db912a8f244a4ccbbc807fd3f618 /playbooks/adhoc | |
| parent | 0658eea31bcf7db761463a9d734b07b4a5984e0f (diff) | |
| download | openshift-c8cf5fca56f8ccaf034e2d5bfd30c750973dc572.tar.gz openshift-c8cf5fca56f8ccaf034e2d5bfd30c750973dc572.tar.bz2 openshift-c8cf5fca56f8ccaf034e2d5bfd30c750973dc572.tar.xz openshift-c8cf5fca56f8ccaf034e2d5bfd30c750973dc572.zip | |
s3_registry no filter named 'lookup'
* Added a default function for the lookup.
* According to [1] added default(,true) to avoid empty string
[1] https://github.com/openshift/openshift-ansible/blob/master/docs/best_practices_guide.adoc#filters
Diffstat (limited to 'playbooks/adhoc')
| -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: |