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-etcd/private/scaleup.yml | |
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-etcd/private/scaleup.yml')
-rw-r--r-- | playbooks/openshift-etcd/private/scaleup.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-etcd/private/scaleup.yml b/playbooks/openshift-etcd/private/scaleup.yml index 3ef043ec8..dc667958f 100644 --- a/playbooks/openshift-etcd/private/scaleup.yml +++ b/playbooks/openshift-etcd/private/scaleup.yml @@ -69,8 +69,8 @@ etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_etcd_hosts: "{{ hostvars - | oo_select_keys(groups['oo_etcd_to_config'] | union(groups['oo_new_etcd_to_config'] | default([]) )) - | oo_collect('openshift.common.hostname') + | lib_utils_oo_select_keys(groups['oo_etcd_to_config'] | union(groups['oo_new_etcd_to_config'] | default([]) )) + | lib_utils_oo_collect('openshift.common.hostname') | default(none, true) }}" openshift_master_etcd_port: "{{ (etcd_client_port | default('2379')) if (groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config) else none }}" roles: |