From 4e62fd382bea9819b177a4d40d417995ae397144 Mon Sep 17 00:00:00 2001
From: Joe Stuart <jstuart@redhat.com>
Date: Fri, 24 Apr 2020 14:11:15 -0500
Subject: [PATCH] make minishift and k8s_objects external

---
 playbooks/roles/cleanup/tasks/cleanup.yml     | 25 +-----
 playbooks/roles/k8s_objects/tasks/main.yml    | 52 -------------
 .../roles/minishift/tasks/init_minishift.yml  | 51 ------------
 .../minishift/tasks/install_minishift_bin.yml | 31 --------
 playbooks/roles/minishift/tasks/main.yml      | 78 -------------------
 .../minishift/tasks/set_minishift_path.yml    | 11 ---
 playbooks/roles/prereqs/tasks/check_os.yml    | 10 ---
 .../prereqs/tasks/install_kvm_plugin.yml      | 28 -------
 .../prereqs/tasks/install_mac_pre_reqs.yml    | 36 ---------
 .../prereqs/tasks/install_virtual_reqs.yml    | 73 -----------------
 playbooks/roles/prereqs/tasks/main.yml        | 16 ----
 .../roles/prereqs/tasks/setup_nested_virt.yml | 78 -------------------
 playbooks/setup.yml                           |  2 +-
 requirements.yml                              | 11 +++
 14 files changed, 13 insertions(+), 489 deletions(-)
 delete mode 100644 playbooks/roles/k8s_objects/tasks/main.yml
 delete mode 100644 playbooks/roles/minishift/tasks/init_minishift.yml
 delete mode 100644 playbooks/roles/minishift/tasks/install_minishift_bin.yml
 delete mode 100644 playbooks/roles/minishift/tasks/main.yml
 delete mode 100644 playbooks/roles/minishift/tasks/set_minishift_path.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/check_os.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/install_kvm_plugin.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/install_mac_pre_reqs.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/install_virtual_reqs.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/main.yml
 delete mode 100644 playbooks/roles/prereqs/tasks/setup_nested_virt.yml
 create mode 100644 requirements.yml

diff --git a/playbooks/roles/cleanup/tasks/cleanup.yml b/playbooks/roles/cleanup/tasks/cleanup.yml
index 86f92a7d..39ba0b3b 100644
--- a/playbooks/roles/cleanup/tasks/cleanup.yml
+++ b/playbooks/roles/cleanup/tasks/cleanup.yml
@@ -1,25 +1,4 @@
 ---
-# Stop minishift profile, delete minishift profile,
-# delete minishift binary files, and kube config
-
-- name: "Stop minishift if running"
-  shell: "{{ minishift_bin }} stop --profile {{ profile }}"
-  ignore_errors: yes
-
-- name: "Delete minishift profile {{ profile }}"
-  shell: "{{ minishift_bin }} delete --profile {{ profile }} --force"
-  ignore_errors: yes
-
-- name: "Cleanup files and directories {{ minishift_dest_dir }}"
-  file:
-    path: "{{ minishift_dest_dir }}/{{ item }}"
-    state: absent
-  with_items:
-    - "minishift"
-    - "LICENSE"
-    - "README.adoc"
-  ignore_errors: yes
-
 - name: "Cleanup certain files in {{ contra_env_setup_dir }}, kube config, and minishift profile"
   file:
     path: "{{ item }}"
@@ -27,8 +6,6 @@
   with_items:
     - "{{ contra_env_setup_dir }}/.yml"
     - "{{ contra_env_setup_dir }}/.yaml"
-    - "{{ ansible_env.HOME }}/.minishift/profiles/{{ profile }}"
-    - "{{ ansible_env.HOME }}/.kube"
   ignore_errors: yes
 
 # Determine if project directory exists
@@ -46,4 +23,4 @@
     - "{{ contra_env_setup_dir }}/{{ project_dir }}"
   when:
     - pd_is_found.stat.exists
-    - force_repo_clone|bool == true
\ No newline at end of file
+    - force_repo_clone|bool == true
diff --git a/playbooks/roles/k8s_objects/tasks/main.yml b/playbooks/roles/k8s_objects/tasks/main.yml
deleted file mode 100644
index 9bee4750..00000000
--- a/playbooks/roles/k8s_objects/tasks/main.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: set minishift host
-  block:
-    - name: register minishift host
-      shell: "{{ minishift_bin }} ip"
-      register: minishift_host
-
-    - name: set k8s_auth_host
-      set_fact:
-        k8s_auth_host: "https://{{ minishift_host.stdout }}:8443"
-  when: k8s_auth_host is not defined
-
-- name: set auth api key if env var is set
-  set_fact:
-    k8s_auth_api_key: "{{ ansible_env.K8S_AUTH_API_KEY }}"
-  when: ansible_env.K8S_AUTH_API_KEY is defined
-
-- name: Log in (obtain access token)
-  k8s_auth:
-    host: "{{ k8s_auth_host }}"
-    validate_certs: False
-    username: "{{ k8s_username }}"
-    password: "{{ k8s_password }}"
-  register: k8s_auth_results
-  when: k8s_username is defined and k8s_password is defined
-
-- name: set auth api key if username/password is provided
-  set_fact:
-    k8s_auth_api_key: "{{ k8s_auth_results.k8s_auth.api_key }}"
-  when: k8s_auth_results.k8s_auth.api_key is defined
-
-- name: Create openshift project
-  k8s:
-    host: "{{ k8s_auth_host }}"
-    api_key: "{{ k8s_auth_api_key }}"
-    name: "{{ PROJECT }}"
-    api_version: v1
-    kind: Project
-    state: present
-    validate_certs: false
-
-- name: Creating k8s objects
-  k8s:
-    host: "{{ k8s_auth_host }}"
-    api_key: "{{ k8s_auth_api_key }}"
-    namespace: "{{ PROJECT }}"
-    state: present
-    validate_certs: false
-    definition: "{{ lookup('template', project_dir + '/' + os_template_dir + '/' + item) }}"
-  with_list:
-    "{{ k8s_resource_objects }}"
-
diff --git a/playbooks/roles/minishift/tasks/init_minishift.yml b/playbooks/roles/minishift/tasks/init_minishift.yml
deleted file mode 100644
index 819240db..00000000
--- a/playbooks/roles/minishift/tasks/init_minishift.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-# start minishift
-- name: "Initialization of minishift cluster with profile {{ profile }}"
-  shell: "{{ minishift_bin }} start --profile {{ profile }} --cpus {{ cpus }} --disk-size {{ disk_size }} --memory {{ memory }} --openshift-version {{ oc_version }} --iso-url file:///{{ minishift_dest_dir }}/minishift.iso"
-
-- block:
-  - name: "Check if <cpu mode=host-passthrough/> is already set"
-    find:
-      paths: "/etc/libvirt/qemu"
-      patterns: "{{ profile }}.xml"
-      contains: '\s*<cpu.*\smode=[\"\'']host-passthrough[\"\''].*/>'
-    register: minishift_vm_config_files
-    become: yes
-
-  - set_fact:
-      cpu_mode_not_configured: ((minishift_vm_config_files | default([])) | length == 0)
-
-  - name: "Wait for the cluster to come up completely"
-    pause:
-      minutes: 3
-    when: (cpu_mode_not_configured|bool) or
-          (start_minishift|bool == false)
-
-  - name: "Stop the minishift profile {{ profile }}"
-    shell: "{{ minishift_bin }} stop --profile {{ profile }}"
-    when: (cpu_mode_not_configured|bool) or
-          (start_minishift|bool == false)
-
-  - name: "Update the minishift VM config"
-    lineinfile:
-      path: "/etc/libvirt/qemu/{{ profile }}.xml"
-      insertafter: '\s+</features>'
-      line: "  <cpu mode='host-passthrough'/>"
-    become: yes
-    when: cpu_mode_not_configured|bool
-
-  - name: "Start minishift profile {{ profile }} again if configured"
-    shell: "{{ minishift_bin }} start --profile {{ profile }} --cpus {{ cpus }} --disk-size {{ disk_size }} --memory {{ memory }} --openshift-version {{ oc_version }} --iso-url file:///{{ minishift_dest_dir }}/minishift.iso"
-    when:
-      - cpu_mode_not_configured|bool
-      - start_minishift|bool == true
-
-  - name: set minishift host
-    shell: "{{ minishift_bin }} ip"
-    register: minishift_host
-
-  - name: set k8s_auth_host
-    set_fact:
-      k8s_auth_host: "https://{{ minishift_host.stdout }}:8443"
-
-  when: host_os == "linux"
diff --git a/playbooks/roles/minishift/tasks/install_minishift_bin.yml b/playbooks/roles/minishift/tasks/install_minishift_bin.yml
deleted file mode 100644
index 06db132a..00000000
--- a/playbooks/roles/minishift/tasks/install_minishift_bin.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Install minishift
-
-- name: Query for minishift compressed binary
-  shell: curl -s https://github.com/minishift/minishift/releases/{{ minishift_version }} | grep 'minishift-.*-{{ host_os }}.*' | head -1 | sed 's/.*<a href="\(.*\)" .*/https:\/\/github.com\1/' | cut -d'"' -f1
-  register: get_minishift_bin
-
-- name: "Pull down and extract minishift binary to {{ minishift_dest_dir }}"
-  unarchive:
-    src: "{{ get_minishift_bin.stdout }}"
-    dest: "{{ minishift_dest_dir }}"
-    remote_src: yes
-
-- name: Set minishift_src_dir fact
-  set_fact:
-    minishift_src_dir: "{{ get_minishift_bin.stdout | basename | regex_search(regexp,'\\1') | join(' ') }}"
-  vars:
-    regexp: '(minishift.*amd64).tgz'
-
-- name: "Create a new {{ minishift_dest_dir }} if it doesn't exist"
-  file:
-    path: "{{ minishift_dest_dir }}"
-    state: directory
-
-- name: "Copy minishift version files to {{ minishift_dest_dir }}/minishift/"
-  shell: cp {{ minishift_dest_dir }}/{{ minishift_src_dir }}/* {{ minishift_dest_dir }}/
-
-- name: "Delete {{ ansible_env.HOME }}/{{ minishift_src_dir }}"
-  file:
-    path: "{{ minishift_dest_dir }}//{{ minishift_src_dir }}"
-    state: absent
diff --git a/playbooks/roles/minishift/tasks/main.yml b/playbooks/roles/minishift/tasks/main.yml
deleted file mode 100644
index 2c212365..00000000
--- a/playbooks/roles/minishift/tasks/main.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# setup minishift
-
-- fail:
-    msg: 'setup_minishift cannot be true with a defined value for openshift_cluster_ip'
-  when: openshift_cluster_ip != ""
-
-# Determine if minishift binary exists
-- name: "Is minishift binary present in {{ minishift_dest_dir }}"
-  stat:
-    path: "{{ minishift_bin }}"
-  register: minishift_bin_path
-
-# Install minishift
-- import_tasks: install_minishift_bin.yml
-  when: (minishift_bin_path.stat.exists == false) or
-        (force_minishift_install|bool == true)
-
-- name: "Make sure minishift profile {{ profile }} is active"
-  shell: "{{ minishift_bin}} profile set {{ profile }}"
-
-# Set disk size, memory, set Openshift version, skip OpenShift version and release check
-- name: "Set minishift disk-size {{ disk_size }}"
-  shell: "{{ minishift_bin }} config set disk-size {{ disk_size }}"
-
-- name: "Set minishift memory {{ memory }}"
-  shell: "{{ minishift_bin }} config set memory {{ memory }}"
-
-- name: "Set minishift cpus {{ cpus }}"
-  shell: "{{ minishift_bin }} config set cpus {{ cpus }}"
-
-- name: "Set minishift openshift-version to {{ oc_version }}"
-  shell: "{{ minishift_bin }} config set openshift-version {{ oc_version }}"
-
-- name: "Set minishift minishift_insecure_registry"
-  shell: "{{ minishift_bin }} config set insecure-registry \"{{ minishift_insecure_registry }}\""
-  when: minishift_insecure_registry != ""
-
-- name: "Set minishift skip-check-openshift-version"
-  shell: "{{ minishift_bin }} config set skip-check-openshift-version true"
-  when: minishift_version != "v1.12.0"
-
-- name: "Set minishift skip-check-openshift-release"
-  shell: "{{ minishift_bin }} config set skip-check-openshift-release true"
-  when: minishift_version != "v1.12.0"
-
-# Set vm-driver to virtualbox if using a mac
-- name: "Set minishift vm-driver to virtualbox"
-  shell: "{{ minishift_bin }} config set vm-driver virtualbox"
-  when: host_os == "darwin"
-
-- name: "Pull down the minishift iso if running minishift locally"
-  get_url:
-    url: "{{ minishift_iso }}"
-    dest: "{{ minishift_dest_dir }}/minishift.iso"
-    timeout: 120
-  when: minishift_external_vm_ip == ""
-
-- name: "Check if the minishift profile is running"
-  shell: "{{ minishift_bin }} status --profile {{ profile }}"
-  register: minishift_profile_status
-  ignore_errors: yes
-
-# Import_tasks install_oc_bin
-- name: "Get OpenShift client binary(oc) version {{ oc_version }} to {{ contra_env_setup_dir }}"
-  import_tasks: "{{ playbook_dir }}/roles/os_temps/tasks/install_oc_bin.yml"
-
-# Initialize minishift locally
-- import_tasks: init_minishift.yml
-  when: ((minishift_profile_status.stdout_lines and minishift_profile_status.stdout_lines[0]|lower == "does not exist") or
-        (minishift_profile_status.rc != 0)) and (minishift_external_vm_ip == "")
-
-# Start minishift on an external VM if configured
-- name: "Initialization of minishift cluster with profile {{ profile }} on an existing VM ip {{ minishift_external_vm_ip }}"
-  shell: "{{ minishift_bin }} start --profile {{ profile }} --openshift-version {{ oc_version }} --vm-driver generic --remote-ipaddress {{ minishift_external_vm_ip }} --remote-ssh-user {{ minishift_external_vm_user }} --remote-ssh-key {{ minishift_external_vm_ssh_key_location }}"
-  when: ((minishift_profile_status.stdout_lines and minishift_profile_status.stdout_lines[0]|lower == "does not exist") or
-        (minishift_profile_status.rc != 0)) and (minishift_external_vm_ip != "")
-
diff --git a/playbooks/roles/minishift/tasks/set_minishift_path.yml b/playbooks/roles/minishift/tasks/set_minishift_path.yml
deleted file mode 100644
index 4414729d..00000000
--- a/playbooks/roles/minishift/tasks/set_minishift_path.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# set path for minishift
-
-- name: "Set path for minishift in {{ ansible_env.HOME }}/{{ shell_rc }}"
-  lineinfile:
-    path: "{{ ansible_env.HOME }}/{{ shell_rc }}"
-    line: 'export PATH="$PATH:{{ minishift_dest_dir }}"'
-    create: yes
-
-- name: "Source {{ ansible_env.HOME }}/{{ shell_rc }}"
-  shell: source {{ ansible_env.HOME }}/{{ shell_rc }}
diff --git a/playbooks/roles/prereqs/tasks/check_os.yml b/playbooks/roles/prereqs/tasks/check_os.yml
deleted file mode 100644
index dd2d893d..00000000
--- a/playbooks/roles/prereqs/tasks/check_os.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Get OS of host machine
-
-- name: Check Operating System
-  shell: "uname"
-  register: uname_result
-
-- name: Save the OS as host_os
-  set_fact:
-    host_os: "{{ uname_result.stdout | lower }}"
diff --git a/playbooks/roles/prereqs/tasks/install_kvm_plugin.yml b/playbooks/roles/prereqs/tasks/install_kvm_plugin.yml
deleted file mode 100644
index 2a62ddd2..00000000
--- a/playbooks/roles/prereqs/tasks/install_kvm_plugin.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# Install the kvm plugin
-- name: Pull down kvm plugin
-  get_url:
-    url: "https://github.com/dhiltgen/docker-machine-kvm/releases/download/{{ dkvm_version }}/docker-machine-driver-kvm-centos7"
-    dest: /usr/local/bin/docker-machine-driver-kvm
-    mode: 755
-  become: true
-
-- name: Start and enable libvirtd
-  service:
-    name: libvirtd
-    state: started
-    enabled: yes
-  become: true
-
-- name: "Add user {{ user }} to the libvirt group"
-  user:
-    name: "{{ user }}"
-    groups: libvirt
-    append: yes
-  become: true
-
-- name: Newgroup libvirt
-  user:
-    name: libvirt
-    state: present
-  become: true
diff --git a/playbooks/roles/prereqs/tasks/install_mac_pre_reqs.yml b/playbooks/roles/prereqs/tasks/install_mac_pre_reqs.yml
deleted file mode 100644
index 236e5eab..00000000
--- a/playbooks/roles/prereqs/tasks/install_mac_pre_reqs.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: Set homebrew packages to install
-  set_fact:
-    brew_cask_packages:
-      - "virtualbox"
-    brew_packages:
-      - "jq"
-      - "gnu-tar"
-
-- name: Ensuring Homebrew Is Installed
-  stat:
-    path: "/usr/local/bin/brew"
-  register: "homebrew_check"
-
-- name: Installing Homebrew
-  command: "/usr/bin/ruby -e '$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)'"
-  when: not homebrew_check.stat.exists
-
-- name: Updating Homebrew
-  homebrew:
-    update_homebrew: true
-  when: homebrew_check.stat.exists
-
-- name: Installing Homebrew Packages
-  homebrew:
-    name: "{{ item }}"
-    state: "present"
-  with_items: "{{ brew_packages }}"
-  when: homebrew_check.stat.exists
-
-- name: Installing Homebrew Cask Packages
-  homebrew_cask:
-    name: "{{ item }}"
-    state: "present"
-  with_items: "{{ brew_cask_packages }}"
-  when: homebrew_check.stat.exists
diff --git a/playbooks/roles/prereqs/tasks/install_virtual_reqs.yml b/playbooks/roles/prereqs/tasks/install_virtual_reqs.yml
deleted file mode 100644
index c5055208..00000000
--- a/playbooks/roles/prereqs/tasks/install_virtual_reqs.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-- name: Install pre-requesites for dnf support for Fedora 29 and below
-  raw: dnf install -y --allowerasing python-dnf
-  when: ansible_distribution == 'Fedora' and ansible_distribution_version|int <= 29
-  become: true
-
-- name: Install pre-requesites for dnf support for Fedora 30 and above
-  raw: dnf install -y --allowerasing python3-dnf
-  when: ansible_distribution == 'Fedora' and ansible_distribution_version|int >= 30
-  become: true
-
-- name: Check if EPEL is installed for non Fedora distros
-  shell: rpm -qa | grep epel-release
-  register: epel_rpm
-  ignore_errors: yes
-  when: not ansible_distribution == 'Fedora'
-  become: true
-
-- name: Pull down the EPEL for for non Fedora distros
-  get_url:
-    url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
-    dest: "{{ ansible_env.HOME }}/epel-release-latest-7.noarch.rpm"
-  when:
-    - not ansible_distribution == 'Fedora'
-    - epel_rpm.stdout == ""
-
-- name: Install EPEL for non Fedora distros
-  yum:
-    name: "{{ ansible_env.HOME }}/epel-release-latest-7.noarch.rpm"
-    state: present
-  when:
-    - not ansible_distribution == 'Fedora'
-    - epel_rpm.stdout == ""
-  become: true
-
-- name: "Install libvirt, qemu-kvm, and jq on {{ ansible_distribution }}"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - libvirt
-    - qemu-kvm
-    - jq
-    - libselinux-python
-    - git
-  become: true
-  when: not ansible_distribution == 'Fedora'
-
-- name: "Install libvirt, qemu-kvm, and jq on {{ ansible_distribution }} version 29 or below"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - libvirt
-    - qemu-kvm
-    - jq
-    - libselinux-python
-    - git
-  become: true
-  when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int <= 29
-
-- name: "Install libvirt, qemu-kvm, and jq on {{ ansible_distribution }} version 30 or above"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - libvirt
-    - qemu-kvm
-    - jq
-    - python3-libselinux
-    - git
-  become: true
-  when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 30
diff --git a/playbooks/roles/prereqs/tasks/main.yml b/playbooks/roles/prereqs/tasks/main.yml
deleted file mode 100644
index a8090322..00000000
--- a/playbooks/roles/prereqs/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# tasks file for prereqs
-
-# install necessary virtualization plugins
-- name: Linux pre reqs setup
-  block:
-    - import_tasks: setup_nested_virt.yml
-      when: setup_nested_virt|bool == true
-    - import_tasks: install_virtual_reqs.yml
-    - import_tasks: install_kvm_plugin.yml
-  when: host_os == "linux"
-
-# install homebrew and brew packages
-- name: Mac pre req setup
-  import_tasks: install_mac_pre_reqs.yml
-  when: host_os == "darwin"
diff --git a/playbooks/roles/prereqs/tasks/setup_nested_virt.yml b/playbooks/roles/prereqs/tasks/setup_nested_virt.yml
deleted file mode 100644
index 7e4f48aa..00000000
--- a/playbooks/roles/prereqs/tasks/setup_nested_virt.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# Check and enable virtualization if necessary
-#  REBOOT WILL BE REQUIRED IF ENABLED
-
-- name: "Check virtualization settings"
-  shell: cat /proc/cpuinfo | grep 'vmx\|svm'
-  register: cpuinfo
-  ignore_errors: true
-  when: run_prereqs|bool == true
-
-- name: "Output of cpuinfo from proc"
-  debug:
-    msg: "cpuinfo: {{ cpuinfo.stdout }}"
-
-- name: "Exit if virtualization is not turned on in the BIOS"
-  fail: msg="Please enable Intel virtualization (VT) or AMD (V) within the host machine's BIOS"
-  when: "cpuinfo.stdout == ''"
-
-- name: "Check virtualization settings for Intel"
-  command: cat /sys/module/kvm_intel/parameters/nested
-  register: nestedintel
-  ignore_errors: true
-  when: run_prereqs|bool == true
-
-- name: "Output of kvm_intel nested"
-  debug:
-    msg: "cpuinfo: {{ nestedintel.stdout }}"
-  when: "nestedintel.stdout != 'Y'"
-
-- name: "Setup nested virtualization Intel - rmmod"
-  command: rmmod kvm-intel
-  become: true
-  when: "nestedintel.stdout == 'N'"
-
-- name: "Setup nested virtualization Intel - update dist.conf"
-  shell: echo 'options kvm-intel nested=y' >> /etc/modprobe.d/dist.conf
-  become: true
-  when: "nestedintel.stdout == 'N'"
-
-- name: "Setup nested virtualization Intel - modprobe"
-  command: modprobe kvm-intel
-  become: true
-  when: "nestedintel.stdout == 'N'"
-
-- name: "Check virtualization settings for AMD"
-  command: cat /sys/module/kvm_amd/parameters/nested
-  register: nestedamd
-  ignore_errors: true
-  when: run_prereqs|bool == true
-
-- name: "Output of kvm_amd nested"
-  debug:
-    msg: "cpuinfo: {{ nestedamd.stdout }}"
-  when: "nestedamd.stdout == 'Y'"
-
-- name: "Setup nested virtualization AMD - rmmod"
-  command: rmmod kvm_amd
-  become: true
-  when: "nestedamd.stdout == 'N'"
-
-- name: "Setup nested virtualization AMD - update dist.conf"
-  shell: echo 'options kvm_amd nested=y' >> /etc/modprobe.d/dist.conf
-  become: true
-  when: "nestedamd.stdout == 'N'"
-
-- name: "Setup nested virtualization AMD - modprobe"
-  command: modprobe kvm_amd
-  become: true
-  when: "nestedamd.stdout == 'N'"
-
-- name: "Exit if nested virtualization is off"
-  fail: msg="NESTED VIRT HAS BEEN ENABLED PLEASE REBOOT"
-  when:
-    - nestedintel.stdout == "N"
-    - nestedamd.stdout == "N"
-
-
-
diff --git a/playbooks/setup.yml b/playbooks/setup.yml
index f539bd23..a0cc0c44 100644
--- a/playbooks/setup.yml
+++ b/playbooks/setup.yml
@@ -16,7 +16,7 @@
     - role: create
     - { role: prereqs, when: "run_prereqs|bool == true and setup_minishift|bool == true" }
     - { role: minishift, when: "setup_minishift|bool == true" }
-    - { role: k8s_objects, when: "set_containers|bool == true" }
+    - { role: os_temps, when: "set_containers|bool == true" }
     - { role: pipeline, when: setup_pipelines|bool == true }
     - { role: playbook_hooks, when: setup_playbook_hooks|bool == true }
   post_tasks:
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 00000000..24d2159c
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,11 @@
+# from GitHub, overriding the name and specifying a specific tag
+- name: contra.minishift
+  src: git@github.com:CentOS-PaaS-SIG/contra-minishift.git
+  scm: git
+  version: master
+
+- name: contra.k8s_objects
+  src: git@github.com:CentOS-PaaS-SIG/contra-k8s_objects.git
+  scm: git
+  version: master
+