Browse Source

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.
OpenShift Merge Robot 7 years ago
parent
commit
a70aa12dfa
1 changed files with 1 additions and 1 deletions
  1. 1 1
      roles/openshift_hosted/tasks/registry/secure.yml

+ 1 - 1
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') }}"