From 3215c383d3ee751d095a0db3d252c31a87891c19 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Fri, 15 Jul 2016 15:33:13 -0400
Subject: Remove relative lookup for registry config and check for skipped
update in registry redeploy conditional.
---
roles/openshift_hosted/tasks/registry/storage/object_storage.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'roles/openshift_hosted/tasks')
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
--
cgit v1.2.3
From afe2fb4cb2e9755572eabf131f2198081b4b92fb Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Fri, 15 Jul 2016 16:34:29 -0400
Subject: Temporarily link registry config templates for ansible 1.9.x support.
---
roles/openshift_hosted/tasks/registry/storage/registry_config.j2 | 1 +
roles/openshift_hosted/tasks/registry/storage/registry_config_secret.j2 | 1 +
2 files changed, 2 insertions(+)
create mode 120000 roles/openshift_hosted/tasks/registry/storage/registry_config.j2
create mode 120000 roles/openshift_hosted/tasks/registry/storage/registry_config_secret.j2
(limited to 'roles/openshift_hosted/tasks')
diff --git a/roles/openshift_hosted/tasks/registry/storage/registry_config.j2 b/roles/openshift_hosted/tasks/registry/storage/registry_config.j2
new file mode 120000
index 000000000..f3e82ad4f
--- /dev/null
+++ b/roles/openshift_hosted/tasks/registry/storage/registry_config.j2
@@ -0,0 +1 @@
+../../../templates/registry_config.j2
\ No newline at end of file
diff --git a/roles/openshift_hosted/tasks/registry/storage/registry_config_secret.j2 b/roles/openshift_hosted/tasks/registry/storage/registry_config_secret.j2
new file mode 120000
index 000000000..b9e82c1ea
--- /dev/null
+++ b/roles/openshift_hosted/tasks/registry/storage/registry_config_secret.j2
@@ -0,0 +1 @@
+../../../templates/registry_config_secret.j2
\ No newline at end of file
--
cgit v1.2.3