Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common

Merged by openshift-bot

1 files changed, 0 insertions, 78 deletions

diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
deleted file mode 100644
index a0bd6c860..000000000
--- a/roles/openshift_common/tasks/main.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-- fail:
-    msg: Flannel can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use flannel
-  when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_flannel | default(false) | bool
-
-- fail:
-    msg: Nuage sdn can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use nuage
-  when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_nuage | default(false) | bool
-
-- fail:
-    msg: Nuage sdn can not be used with flannel
-  when: openshift_use_flannel | default(false) | bool and openshift_use_nuage | default(false) | bool
-
-- fail:
-    msg: Contiv can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use contiv
-  when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_contiv | default(false) | bool
-
-- fail:
-    msg: Contiv can not be used with flannel
-  when: openshift_use_flannel | default(false) | bool and openshift_use_contiv | default(false) | bool
-
-- fail:
-    msg: Contiv can not be used with nuage
-  when: openshift_use_nuage | default(false) | bool and openshift_use_contiv | default(false) | bool
-
-- fail:
-    msg: Calico can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use Calico
-  when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_calico | default(false) | bool
-
-- fail:
-    msg: The Calico playbook does not yet integrate with the Flannel playbook in Openshift. Set either openshift_use_calico or openshift_use_flannel, but not both.
-  when: openshift_use_calico | default(false) | bool and openshift_use_flannel | default(false) | bool
-
-- fail:
-    msg: Calico can not be used with Nuage in Openshift. Set either openshift_use_calico or openshift_use_nuage, but not both
-  when: openshift_use_calico | default(false) | bool and openshift_use_nuage | default(false) | bool
-
-- fail:
-    msg: Calico can not be used with Contiv in Openshift. Set either openshift_use_calico or openshift_use_contiv, but not both
-  when: openshift_use_calico | default(false) | bool and openshift_use_contiv | default(false) | bool
-
-- fail:
-    msg: openshift_hostname must be 63 characters or less
-  when: openshift_hostname is defined and openshift_hostname | length > 63
-
-- name: Set common Cluster facts
-  openshift_facts:
-    role: common
-    local_facts:
-      install_examples: "{{ openshift_install_examples | default(True) }}"
-      use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}"
-      sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}"
-      use_flannel: "{{ openshift_use_flannel | default(None) }}"
-      use_calico: "{{openshift_use_calico | default(None) }}"
-      use_nuage: "{{ openshift_use_nuage | default(None) }}"
-      use_contiv: "{{ openshift_use_contiv | default(None) }}"
-      use_manageiq: "{{ openshift_use_manageiq | default(None) }}"
-      data_dir: "{{ openshift_data_dir | default(None) }}"
-      use_dnsmasq: "{{ openshift_use_dnsmasq | default(None) }}"
-
-- name: Install the base package for versioning
-  package:
-    name: "{{ openshift.common.service_type }}{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
-    state: present
-  when: not openshift.common.is_containerized | bool
-
-- name: Set version facts
-  openshift_facts:
-
-# For enterprise versions < 3.1 and origin versions < 1.1 we want to set the
-# hostname by default.
-- set_fact:
-    set_hostname_default: "{{ not openshift.common.version_gte_3_1_or_1_1 }}"
-
-- name: Set hostname
-  command: >
-    hostnamectl set-hostname {{ openshift.common.hostname }}
-  when: openshift_set_hostname | default(set_hostname_default) | bool