From 3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 23 Aug 2017 17:57:12 -0400
Subject: Merging openshift_node with openshift bootstrap.

---
 roles/openshift_ami_prep/defaults/main.yml   | 50 ----------------------------
 roles/openshift_ami_prep/tasks/main.yml      | 42 -----------------------
 roles/openshift_ami_prep/tasks/yum_repos.yml | 14 --------
 3 files changed, 106 deletions(-)
 delete mode 100644 roles/openshift_ami_prep/defaults/main.yml
 delete mode 100644 roles/openshift_ami_prep/tasks/main.yml
 delete mode 100644 roles/openshift_ami_prep/tasks/yum_repos.yml

(limited to 'roles/openshift_ami_prep')

diff --git a/roles/openshift_ami_prep/defaults/main.yml b/roles/openshift_ami_prep/defaults/main.yml
deleted file mode 100644
index 2ba6d8eae..000000000
--- a/roles/openshift_ami_prep/defaults/main.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-
-
-r_openshift_ami_prep_packages:
-- atomic-openshift-master
-- atomic-openshift-node
-- atomic-openshift-docker-excluder
-- atomic-openshift-sdn-ovs
-- openvswitch
-- docker
-- etcd
-#- pcs
-- haproxy
-- dnsmasq
-- ntp
-- logrotate
-- httpd-tools
-- bind
-- firewalld
-- libselinux-python
-- conntrack-tools
-- openssl
-- cloud-init
-- iproute
-- python-dbus
-- PyYAML
-- yum-utils
-- python2-boto
-- python2-boto3
-- cloud-utils-growpart
-# gluster
-- glusterfs-fuse
-- heketi-client
-# nfs
-- nfs-utils
-- flannel
-- bash-completion
-# cockpit
-- cockpit-ws
-- cockpit-system
-- cockpit-bridge
-- cockpit-docker
-# iscsi
-- iscsi-initiator-utils
-# ceph
-- ceph-common
-# systemcontainer
-# - runc
-# - container-selinux
-# - atomic
diff --git a/roles/openshift_ami_prep/tasks/main.yml b/roles/openshift_ami_prep/tasks/main.yml
deleted file mode 100644
index 98f7bc0e2..000000000
--- a/roles/openshift_ami_prep/tasks/main.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: install repositories
-  include: yum_repos.yml
-  static: yes
-
-- name: install needed rpm(s)
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ r_openshift_ami_prep_packages }}"
-
-- name: create the directory for node
-  file:
-    state: directory
-    path: "/etc/systemd/system/{{ r_openshift_ami_prep_node }}.service.d"
-
-- name: laydown systemd override
-  copy:
-    dest: "/etc/systemd/system/{{ r_openshift_ami_prep_node }}.service.d/override.conf"
-    content: |
-      [Unit]
-      After=cloud-init.service
-
-- name: update the sysconfig to have KUBECONFIG
-  lineinfile:
-    dest: "/etc/sysconfig/{{ r_openshift_ami_prep_node }}"
-    line: "KUBECONFIG=/root/csr_kubeconfig"
-    regexp: "^KUBECONFIG=.*"
-
-- name: update the ExecStart to have bootstrap
-  lineinfile:
-    dest: "/usr/lib/systemd/system/{{ r_openshift_ami_prep_node }}.service"
-    line: "{% raw %}ExecStart=/usr/bin/openshift start node --bootstrap --kubeconfig=${KUBECONFIG} $OPTIONS{% endraw %}"
-    regexp: "^ExecStart=.*"
-
-- name: systemctl enable origin-node
-  systemd:
-    name: "{{ item }}"
-    enabled: no
-  with_items:
-  - "{{ r_openshift_ami_prep_node }}.service"
-  - "{{ r_openshift_ami_prep_master }}.service"
diff --git a/roles/openshift_ami_prep/tasks/yum_repos.yml b/roles/openshift_ami_prep/tasks/yum_repos.yml
deleted file mode 100644
index c48c67ac2..000000000
--- a/roles/openshift_ami_prep/tasks/yum_repos.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Create our install repository
-  yum_repository:
-    description: "{{ item.description | default(omit) }}"
-    name: "{{ item.name }}"
-    baseurl: "{{ item.baseurl }}"
-    gpgkey: "{{ item.gpgkey | default(omit)}}"
-    gpgcheck: "{{ item.gpgcheck | default(1) }}"
-    sslverify: "{{ item.sslverify | default(1) }}"
-    sslclientkey: "{{ item.sslclientkey | default(omit) }}"
-    sslclientcert: "{{ item.sslclientcert | default(omit) }}"
-    file: "{{ item.file }}"
-    enabled: "{{ item.enabled }}"
-  with_items: "{{ r_openshift_ami_prep_yum_repositories }}"
-- 
cgit v1.2.3