diff options
author | Andrew Butcher <abutcher@redhat.com> | 2016-06-30 13:20:10 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-07-07 13:31:12 -0400 |
commit | 57dfae185d3d0e02ebe515263c54867bee37b45e (patch) | |
tree | fce310bd381bb38145aed3dc10424484feaf96c6 /playbooks/common/openshift-master | |
parent | 1a2c22a060b8b6f0e64d452fdfc13012d3c067ed (diff) | |
download | openshift-57dfae185d3d0e02ebe515263c54867bee37b45e.tar.gz openshift-57dfae185d3d0e02ebe515263c54867bee37b45e.tar.bz2 openshift-57dfae185d3d0e02ebe515263c54867bee37b45e.tar.xz openshift-57dfae185d3d0e02ebe515263c54867bee37b45e.zip |
Various hosted component improvements
* [openshift_projects] Add openshift_projects role
* [openshift_hosted] hosted deployments use openshift_hosted_infra_selector if openshift_hosted_<component>_selector is not defined
* [openshift_hosted] move openshift_projects, openshift_serviceaccounts and openshift_metrics to dependencies of openshift_hosted
* [router] improve router deployment
- add router option to force subdomain
- add CA to router certificate options
* [registry] move registry config into openshift_hosted role
- additional registry fixes/tweaks
- add s3 storage support for registry
* [serviceaccount] fix up serviceaccount creation
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r-- | playbooks/common/openshift-master/config.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 7a59f3ea3..8fd0904d6 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -186,11 +186,6 @@ | list ) }}" master_cert_subdir: master-{{ openshift.common.hostname }} master_cert_config_dir: "{{ openshift.common.config_base }}/master" - - set_fact: - openshift_infra_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) - | oo_nodes_with_label('region', 'infra') - | oo_collect('inventory_hostname') }}" - when: openshift_infra_nodes is not defined and groups.oo_nodes_to_config | default([]) | length > 0 - name: Configure master certificates hosts: oo_first_master |