changing lookups

README.md

@@ -7,6 +7,7 @@ The master branch will now contain the most current release of OpenShift Contain
 We will now have branches for the stable releases:
 - Release-3.6
 - Release-3.7
+- Release-3.9
 - etc.
 
 

dockerregistrygov.yaml

@@ -8,4 +8,4 @@
     description: "Set registry to use Azure Storage"
   tasks:
   - name: Configure docker-registry to use Azure Storage
-    shell: oc env dc docker-registry -e REGISTRY_STORAGE=azure -e REGISTRY_STORAGE_AZURE_ACCOUNTNAME=$REGISTRYSA -e REGISTRY_STORAGE_AZURE_ACCOUNTKEY=$ACCOUNTKEY -e REGISTRY_STORAGE_AZURE_CONTAINER=registry -e REGISTRY_STORAGE_AZURE_REALM=core.usgovcloudapi.net
+    shell: oc env dc docker-registry -e REGISTRY_STORAGE=azure -e REGISTRY_STORAGE_AZURE_ACCOUNTNAME={{ lookup('env','REGISTRYSA') }} -e REGISTRY_STORAGE_AZURE_ACCOUNTKEY={{ lookup('env','ACCOUNTKEY') }} -e REGISTRY_STORAGE_AZURE_CONTAINER=registry -e REGISTRY_STORAGE_AZURE_REALM=core.usgovcloudapi.net

dockerregistrypublic.yaml

@@ -8,4 +8,4 @@
     description: "Set registry to use Azure Storage"
   tasks:
   - name: Configure docker-registry to use Azure Storage
-    shell: oc env dc docker-registry -e REGISTRY_STORAGE=azure -e REGISTRY_STORAGE_AZURE_ACCOUNTNAME=$REGISTRYSA -e REGISTRY_STORAGE_AZURE_ACCOUNTKEY=$ACCOUNTKEY -e REGISTRY_STORAGE_AZURE_CONTAINER=registry
+    shell: oc env dc docker-registry -e REGISTRY_STORAGE=azure -e REGISTRY_STORAGE_AZURE_ACCOUNTNAME={{ lookup('env','REGISTRYSA') }} -e REGISTRY_STORAGE_AZURE_ACCOUNTKEY={{ lookup('env','ACCOUNTKEY') }} -e REGISTRY_STORAGE_AZURE_CONTAINER=registry

updateinfrahosts.yaml

@@ -5,6 +5,6 @@
   - lineinfile:
       dest: /etc/ansible/hosts
       insertafter: '[new_nodes]'
-      line: "$INFRA openshift_node_labels=\"{'type': 'infra', 'zone': 'default'}\" openshift_hostname=$INFRA"
+      line: "{{ lookup('env','INFRA') }} openshift_node_labels=\"{'type': 'infra', 'zone': 'default', 'region': 'infra'}\" openshift_hostname={{ lookup('env','INFRA') }}"
       regexp: '^$INFRA '
       state: present

updatenodehosts.yaml

@@ -5,6 +5,6 @@
   - lineinfile:
       dest: /etc/ansible/hosts
       insertafter: '[new_nodes]'
-      line: "$NODE openshift_node_labels=\"{'type': 'app', 'zone': 'default'}\" openshift_hostname=$NODE"
-      regexp: '^$NODE '
+      line: "{{ lookup('env','NODE') }} openshift_node_labels=\"{'type': 'app', 'zone': 'default'}\" openshift_hostname={{ lookup('env','NODE') }}"
+      regexp: '^{{ lookup('env','NODE') }} '
       state: present