diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-18 14:02:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 14:02:07 -0400 |
| commit | 08791978fdf3ee385760761d4fc6bc47febf1732 (patch) | |
| tree | 0d7d1fe782b47e71469e062848c272f1418e4352 | |
| parent | ac4ef6bb65c24890592b6b35b11be82f4ddc6deb (diff) | |
| parent | afe2fb4cb2e9755572eabf131f2198081b4b92fb (diff) | |
| download | openshift-08791978fdf3ee385760761d4fc6bc47febf1732.tar.gz openshift-08791978fdf3ee385760761d4fc6bc47febf1732.tar.bz2 openshift-08791978fdf3ee385760761d4fc6bc47febf1732.tar.xz openshift-08791978fdf3ee385760761d4fc6bc47febf1732.zip | |
Merge pull request #2162 from abutcher/bz1355702
Bug 1355702 - ansible installaton failed when enable aws s3 backend storage.
3 files changed, 5 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 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 |