diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-13 12:42:32 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:46:22 -0500 |
| commit | 801779eeb6f6308f81ae7c48409de7686c04a0aa (patch) | |
| tree | b6e4e6fcf8b672f5c5ed1269e7ed0c93258090f3 /playbooks/openshift-hosted/private | |
| parent | 84266ade6839f9a82e3111f12fce64b88a48845a (diff) | |
| download | openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.gz openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.bz2 openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.xz openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.zip | |
Relocate filter plugins to lib_utils
This commit relocates filter_plugings to lib_utils,
changes the namespacing to prevent unintended use of
older versions that may be present in filter_plugins/
directory on existing installs.
Add lib_utils to meta depends for roles
Also consolidate some plugins into lib_utils from
various other areas.
Update rpm spec, obsolete plugin rpms.
Diffstat (limited to 'playbooks/openshift-hosted/private')
| -rw-r--r-- | playbooks/openshift-hosted/private/redeploy-registry-certificates.yml | 6 | ||||
| -rw-r--r-- | playbooks/openshift-hosted/private/redeploy-router-certificates.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/openshift-hosted/private/redeploy-registry-certificates.yml b/playbooks/openshift-hosted/private/redeploy-registry-certificates.yml index 7e9363c5f..3943720e3 100644 --- a/playbooks/openshift-hosted/private/redeploy-registry-certificates.yml +++ b/playbooks/openshift-hosted/private/redeploy-registry-certificates.yml @@ -26,11 +26,11 @@ - set_fact: docker_registry_env_vars: "{{ ((l_docker_registry_dc.stdout | from_json)['spec']['template']['spec']['containers'][0]['env'] - | oo_collect('name')) + | lib_utils_oo_collect('name')) | default([]) }}" docker_registry_secrets: "{{ ((l_docker_registry_dc.stdout | from_json)['spec']['template']['spec']['volumes'] - | oo_collect('secret') - | oo_collect('secretName')) + | lib_utils_oo_collect('secret') + | lib_utils_oo_collect('secretName')) | default([]) }}" changed_when: false when: l_docker_registry_dc.rc == 0 diff --git a/playbooks/openshift-hosted/private/redeploy-router-certificates.yml b/playbooks/openshift-hosted/private/redeploy-router-certificates.yml index 2116c745c..b1f60f1ae 100644 --- a/playbooks/openshift-hosted/private/redeploy-router-certificates.yml +++ b/playbooks/openshift-hosted/private/redeploy-router-certificates.yml @@ -36,11 +36,11 @@ - name: Collect router environment variables and secrets set_fact: router_env_vars: "{{ ((l_router_dc.stdout | from_json)['spec']['template']['spec']['containers'][0]['env'] - | oo_collect('name')) + | lib_utils_oo_collect('name')) | default([]) }}" router_secrets: "{{ ((l_router_dc.stdout | from_json)['spec']['template']['spec']['volumes'] - | oo_collect('secret') - | oo_collect('secretName')) + | lib_utils_oo_collect('secret') + | lib_utils_oo_collect('secretName')) | default([]) }}" changed_when: false when: l_router_dc.rc == 0 |