diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-18 21:56:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 21:56:58 -0700 |
| commit | a70aa12dfac9367d696a9c4f9f7883db35399b71 (patch) | |
| tree | 93fb6a89b428665252ec7fb57a904383e43531a4 | |
| parent | fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f (diff) | |
| parent | 3553a955b619049f0599c123fdcf35cca9d8a27d (diff) | |
| download | openshift-a70aa12dfac9367d696a9c4f9f7883db35399b71.tar.gz openshift-a70aa12dfac9367d696a9c4f9f7883db35399b71.tar.bz2 openshift-a70aa12dfac9367d696a9c4f9f7883db35399b71.tar.xz openshift-a70aa12dfac9367d696a9c4f9f7883db35399b71.zip | |
Merge pull request #5156 from mangirdaz/5155-hotfix
Automatic merge from submit-queue
hot fix for env variable resolve
If we use environment variables in our inventory files (and from what I seen we do this everywhere where We deploy OCP) our fact engine ignores env variables so if my path looks like
```
openshift_hosted_registry_routecertificates={"certfile": "{{inventory_dir}}/../files/certs/wildcard.registry.company.local.crt", "keyfile": "{{inventory_dir}}/../files/certs/wildcard.registry.companylocal.key", "cafile":"{{inventory_dir}}/../files/certs/CompanyLocalRootCA.crt"}
openshift_hosted_registry_routehost=containers.registry.comany.local
```
the result is: `/../files/certs/RoSLocalRootCA.crt`
We need to fix our fact set in a long run to read Ansible variables. And it was done in the same way with router certificates already.
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/secure.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml index a8a6f6fc8..434b679df 100644 --- a/roles/openshift_hosted/tasks/registry/secure.yml +++ b/roles/openshift_hosted/tasks/registry/secure.yml @@ -1,7 +1,7 @@ --- - name: Configure facts for docker-registry set_fact: - openshift_hosted_registry_routecertificates: "{{ ('routecertificates' in openshift.hosted.registry.keys()) | ternary(openshift.hosted.registry.routecertificates, {}) }}" + openshift_hosted_registry_routecertificates: "{{ ('routecertificates' in openshift.hosted.registry.keys()) | ternary(openshift_hosted_registry_routecertificates, {}) }}" openshift_hosted_registry_routehost: "{{ ('routehost' in openshift.hosted.registry.keys()) | ternary(openshift.hosted.registry.routehost, False) }}" openshift_hosted_registry_routetermination: "{{ ('routetermination' in openshift.hosted.registry.keys()) | ternary(openshift.hosted.registry.routetermination, 'passthrough') }}" |