summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-07-15 15:33:13 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-07-18 11:18:47 -0400
commit3215c383d3ee751d095a0db3d252c31a87891c19 (patch)
treead6d0fcd8a0e17c4e0f7cc618f5ece35a194be2e
parentac4ef6bb65c24890592b6b35b11be82f4ddc6deb (diff)
downloadopenshift-3215c383d3ee751d095a0db3d252c31a87891c19.tar.gz
openshift-3215c383d3ee751d095a0db3d252c31a87891c19.tar.bz2
openshift-3215c383d3ee751d095a0db3d252c31a87891c19.tar.xz
openshift-3215c383d3ee751d095a0db3d252c31a87891c19.zip
Remove relative lookup for registry config and check for skipped update in registry redeploy conditional.
-rw-r--r--roles/openshift_hosted/tasks/registry/storage/object_storage.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_hosted/tasks/registry/storage/object_storage.yml b/roles/openshift_hosted/tasks/registry/storage/object_storage.yml
index 9db67ecc6..7b1b3f6ff 100644
--- a/roles/openshift_hosted/tasks/registry/storage/object_storage.yml
+++ b/roles/openshift_hosted/tasks/registry/storage/object_storage.yml
@@ -24,10 +24,10 @@
failed_when: false
- set_fact:
- registry_config: "{{ lookup('template', '../templates/registry_config.j2') | b64encode }}"
+ registry_config: "{{ lookup('template', 'registry_config.j2') | b64encode }}"
- set_fact:
- registry_config_secret: "{{ lookup('template', '../templates/registry_config_secret.j2') | from_yaml }}"
+ registry_config_secret: "{{ lookup('template', 'registry_config_secret.j2') | from_yaml }}"
- set_fact:
same_storage_provider: "{{ (secrets.stdout|from_json)['metadata']['annotations']['provider'] | default(none) == openshift.hosted.registry.storage.provider }}"
@@ -111,4 +111,4 @@
--config={{ openshift_hosted_kubeconfig }}
--namespace={{ openshift.hosted.registry.namespace | default('default') }}
deploy dc/docker-registry --latest
- when: secrets.rc == 0 and update_config_secret.rc == 0 and same_storage_provider | bool
+ when: secrets.rc == 0 and not update_config_secret | skipped and update_config_secret.rc == 0 and same_storage_provider | bool