Merge pull request ansibleplaybookbundle#84 from gbenhaim/re_org_part_1

re-org: Move openshift deployment to playbooks dir

Author: gbenhaim

automation/check-patch.openshift_3-7.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-export OPENSHIFT_IMAGE_TAG="v3.7.0"
+export OPENSHIFT_VER="3.7"
 export ANSIBLE_MODULES_VERSION="openshift-ansible-3.7.29-1"
 export OPENSHIFT_PLAYBOOK_PATH="playbooks/byo/config.yml"
 "${0%/*}/check-patch.sh"

automation/check-patch.openshift_3-9.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-export OPENSHIFT_IMAGE_TAG="v3.9.0"
+export OPENSHIFT_VER="3.9"
 export ANSIBLE_MODULES_VERSION="openshift-ansible-3.9.0-0.40.0"
 export OPENSHIFT_PLAYBOOK_PATH="playbooks/deploy_cluster.yml"
 "${0%/*}/check-patch.sh"

automation/check-patch.sh

@@ -103,7 +103,7 @@ main() {
 
     local cluster_type="${CLUSTER_TYPE:-openshift}"
     local ansible_modules_version="${ANSIBLE_MODULES_VERSION:-openshift-ansible-3.7.29-1}"
-    local openshift_image_tag="${OPENSHIFT_IMAGE_TAG:-v3.7.0}"
+    local openshift_ver="${OPENSHIFT_VER:-3.7}"
     local openshift_playbook_path="${OPENSHIFT_PLAYBOOK_PATH:-playbooks/byo/config.yml}"
     local mode="${MODE:-release}"
     local provider="${PROVIDER:-lago}"
@@ -141,7 +141,7 @@ main() {
         "inventory_file=$inventory_file"
         "cluster_type=$cluster_type"
         "ansible_modules_version=$ansible_modules_version"
-	"openshift_image_tag=$openshift_image_tag"
+        "openshift_ver=$openshift_ver"
         "openshift_playbook_path=$openshift_playbook_path"
     )
 

control.yml

@@ -1,3 +1,3 @@
 - import_playbook: "{{ playbook_dir }}/deploy-with-{{ provider | default('lago') }}.yml"
-- import_playbook: "{{ playbook_dir }}/deploy-{{ cluster_type | default('openshift') }}.yml"
+- import_playbook: "{{ playbook_dir }}/playbooks/cluster/{{ cluster_type | default('openshift') }}/config.yml"
 - import_playbook: "{{ playbook_dir }}/install-kubevirt-release.yml"

openshift/roles/prerequisites/tasks/main.yml

@@ -2,31 +2,74 @@
 - hosts: all
   remote_user: root
   pre_tasks:
+    - name: include_vars
+      include_vars:
+        file: "{{ item }}"
+      with_items:
+        - "{{ playbook_dir }}/../../../vars/global_vars.yml"
+        - "{{ playbook_dir }}/vars/{{ openshift_ver }}.yml"
+
+    - name: set SELinux to permissive mode
+      command: setenforce 0
+
+    - name: set SELinux to permissive mode under configuration file
+      selinux:
+        policy: targeted
+        state: permissive
+
+    - name: stop and disable firewalld
+      register: result
+      service:
+        state: stopped
+        enabled: no
+        name: firewalld
+      failed_when: "result|failed and not 'Could not find the requested service' in result.msg"
+
+    - name: install epel repository
+      yum:
+        name: "{{ epel_release_rpm_url }}"
+        state: present
+
     - name: Install openshift_facts requirements
       yum:
         name: "{{ item }}"
       with_items:
         - python-yaml
         - python-ipaddress
+        - wget
+        - git
+        - net-tools
+        - bind-utils
+        - iptables-services
+        - bridge-utils
+        - bash-completion
+        - kexec-tools
+        - sos
+        - psacct
+        - docker
+
     - name: Include openshift_facts module
       import_role:
         name: "{{ openshift_ansible_dir }}/roles/openshift_facts"
+
     - name: Load openshift facts
       openshift_facts:
         role: common
+
     - name: Set facts for docker-storage-setup
       block:
-        - name: Detecting Operating System from ostree_booted
+        - name: Detect Operating System from ostree_booted
           stat:
             path: /run/ostree-booted
           register: ostree_booted
         - name: initialize_facts set fact openshift_is_atomic
           set_fact:
             openshift: "{{ openshift | combine({'common':{'is_atomic': ostree_booted.stat.exists}}, recursive=True) }}"
       when: "'is_atomic' not in openshift.common"
+
   roles:
-    - "{{ playbook_dir }}/openshift/roles/prerequisites"
     - "openshift-contrib/roles/docker-storage-setup"
+
   post_tasks:
     - name: Enable and start docker service
       service:

openshift/roles/prerequisites/vars/main.yml

@@ -0,0 +1,2 @@
+openshift_image_tag: v3.7.0
+openshift_service_catalog_image_version: "{{ openshift_image_tag }}"

deploy-openshift.yml playbooks/cluster/openshift/config.yml

@@ -0,0 +1,2 @@
+openshift_image_tag: v3.9.0-alpha.4
+openshift_service_catalog_image_version: "{{ openshift_image_tag }}"

playbooks/cluster/openshift/vars/3.7.yml

@@ -0,0 +1 @@
+epel_release_rpm_url: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm