diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 |
| commit | ada49b7eccf7fd96e5d4716ffd666987ad63be45 (patch) | |
| tree | 525deee94e5a7506dbea7ea3a6e866873dfba0dd /playbooks/common | |
| parent | 72f295fc7cdef47bffbdffa35b263e120ac9ad93 (diff) | |
| parent | 638aae76fe3e2ce367dbf5901169b509feb181df (diff) | |
| download | openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.gz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.bz2 openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.xz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.zip | |
Merge pull request #1843 from detiber/remove_deprecated_roles
Remove deprecated roles
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 8 |
3 files changed, 0 insertions, 19 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index c5a0f123c..5ed1d3b3c 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -27,10 +27,6 @@ (osm_use_cockpit | bool or osm_use_cockpit is undefined ) - role: flannel_register when: openshift.common.use_flannel | bool - - role: pods - when: openshift.common.deployment_type == 'online' - - role: os_env_extras - when: openshift.common.deployment_type == 'online' - name: Create persistent volumes and create hosted services hosts: oo_first_master diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 060b5aa0d..b9786295c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -367,13 +367,6 @@ group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }} changed_when: False -# Additional instance config for online deployments -- name: Additional instance config - hosts: oo_masters_deployment_type_online - roles: - - pods - - os_env_extras - - name: Delete temporary directory on localhost hosts: localhost connection: local diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 8a41b0b2f..ba050bfe7 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -245,14 +245,6 @@ - file: name={{ mktemp.stdout }} state=absent changed_when: False -# Additional config for online type deployments -- name: Additional instance config - hosts: oo_nodes_deployment_type_online - gather_facts: no - roles: - - os_env_extras - - os_env_extras_node - - name: Set schedulability hosts: oo_first_master vars: |