diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-12-19 13:08:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 13:08:55 -0500 |
commit | 151115eaf18d557aa8f770e61820e10bed4109bc (patch) | |
tree | 2d8a7305669b242ec1c03a06ecb5cf3238dec688 /playbooks/openshift-master/private/config.yml | |
parent | 7ab8e67bfc62e16466e3fd211fded63f16583403 (diff) | |
parent | 801779eeb6f6308f81ae7c48409de7686c04a0aa (diff) | |
download | openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.gz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.bz2 openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.xz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.zip |
Merge pull request #6469 from mgugino-upstream-stage/plugin-consolidate
Plugin consolidate
Diffstat (limited to 'playbooks/openshift-master/private/config.yml')
-rw-r--r-- | playbooks/openshift-master/private/config.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml index 15d301ddb..3093444b4 100644 --- a/playbooks/openshift-master/private/config.yml +++ b/playbooks/openshift-master/private/config.yml @@ -56,9 +56,9 @@ - set_fact: 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 }}" openshift_master_etcd_hosts: "{{ hostvars - | oo_select_keys(groups['oo_etcd_to_config'] + | lib_utils_oo_select_keys(groups['oo_etcd_to_config'] | default([])) - | oo_collect('openshift.common.hostname') + | lib_utils_oo_collect('openshift.common.hostname') | default(none, true) }}" roles: - openshift_facts @@ -150,8 +150,8 @@ hosts: oo_first_master vars: g_session_secrets_present: "{{ (openshift.master.session_auth_secrets | default([])) | length > 0 and (openshift.master.session_encryption_secrets | default([])) | length > 0 }}" - g_session_auth_secrets: "{{ [ 24 | oo_generate_secret ] }}" - g_session_encryption_secrets: "{{ [ 24 | oo_generate_secret ] }}" + g_session_auth_secrets: "{{ [ 24 | lib_utils_oo_generate_secret ] }}" + g_session_encryption_secrets: "{{ [ 24 | lib_utils_oo_generate_secret ] }}" roles: - role: openshift_facts tasks: @@ -172,11 +172,11 @@ openshift_master_session_encryption_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_encryption_secrets }}" openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_etcd_hosts: "{{ hostvars - | oo_select_keys(groups['oo_etcd_to_config'] | default([])) - | oo_collect('openshift.common.hostname') + | lib_utils_oo_select_keys(groups['oo_etcd_to_config'] | default([])) + | lib_utils_oo_collect('openshift.common.hostname') | default(none, true) }}" - openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config'] | default([])) - | oo_collect('openshift.common.ip') | default([]) | join(',') + openshift_no_proxy_etcd_host_ips: "{{ hostvars | lib_utils_oo_select_keys(groups['oo_etcd_to_config'] | default([])) + | lib_utils_oo_collect('openshift.common.ip') | default([]) | join(',') }}" roles: - role: openshift_master_facts |