From 4ed9aef6f8ed0850e70b498e780d0d8e22bc277f Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Mon, 23 Oct 2017 12:57:29 +0200
Subject: Add openshift_openstack role and move tasks there

All the tasks that were previously in playbooks are now under
`roles/openshift_openstack`.

The `openshift-cluster` directory now only contains playbooks that
include tasks from that role. This makes the structure much closer to
that of the AWS provider.
---
 roles/docker-storage-setup/defaults/main.yaml      |  7 ----
 roles/docker-storage-setup/tasks/main.yaml         | 46 ----------------------
 .../templates/docker-storage-setup-dm.j2           |  4 --
 .../templates/docker-storage-setup-overlayfs.j2    |  7 ----
 4 files changed, 64 deletions(-)
 delete mode 100644 roles/docker-storage-setup/defaults/main.yaml
 delete mode 100644 roles/docker-storage-setup/tasks/main.yaml
 delete mode 100644 roles/docker-storage-setup/templates/docker-storage-setup-dm.j2
 delete mode 100644 roles/docker-storage-setup/templates/docker-storage-setup-overlayfs.j2

(limited to 'roles/docker-storage-setup')

diff --git a/roles/docker-storage-setup/defaults/main.yaml b/roles/docker-storage-setup/defaults/main.yaml
deleted file mode 100644
index 062f543ad..000000000
--- a/roles/docker-storage-setup/defaults/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-docker_dev: "/dev/sdb"
-docker_vg: "docker-vol"
-docker_data_size: "95%VG"
-docker_dm_basesize: "3G"
-container_root_lv_name: "dockerlv"
-container_root_lv_mount_path: "/var/lib/docker"
diff --git a/roles/docker-storage-setup/tasks/main.yaml b/roles/docker-storage-setup/tasks/main.yaml
deleted file mode 100644
index 8606eeba4..000000000
--- a/roles/docker-storage-setup/tasks/main.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- name: stop docker
-  service: name=docker state=stopped
-
-- block:
-    - name: create the docker-storage config file
-      template:
-        src: "{{ role_path }}/templates/docker-storage-setup-overlayfs.j2"
-        dest: /etc/sysconfig/docker-storage-setup
-        owner: root
-        group: root
-        mode: 0644
-  when:
-    - ansible_distribution_version | version_compare('7.4', '>=')
-    - ansible_distribution == "RedHat"
-
-- block:
-    - name: create the docker-storage-setup config file
-      template:
-        src: "{{ role_path }}/templates/docker-storage-setup-dm.j2"
-        dest: /etc/sysconfig/docker-storage-setup
-        owner: root
-        group: root
-        mode: 0644
-  when:
-    - ansible_distribution_version | version_compare('7.4', '<')
-    - ansible_distribution == "RedHat"
-
-- block:
-    - name: create the docker-storage-setup config file for CentOS
-      template:
-        src: "{{ role_path }}/templates/docker-storage-setup-dm.j2"
-        dest: /etc/sysconfig/docker-storage-setup
-        owner: root
-        group: root
-        mode: 0644
-
-  # TODO(shadower): Find out which CentOS version supports overlayfs2
-  when:
-    - ansible_distribution == "CentOS"
-
-- name: Install Docker
-  package: name=docker state=present
-
-- name: start docker
-  service: name=docker state=restarted enabled=true
diff --git a/roles/docker-storage-setup/templates/docker-storage-setup-dm.j2 b/roles/docker-storage-setup/templates/docker-storage-setup-dm.j2
deleted file mode 100644
index b5869feff..000000000
--- a/roles/docker-storage-setup/templates/docker-storage-setup-dm.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVS="{{ docker_dev }}"
-VG="{{ docker_vg }}"
-DATA_SIZE="{{ docker_data_size }}"
-EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize={{ docker_dm_basesize }}"
diff --git a/roles/docker-storage-setup/templates/docker-storage-setup-overlayfs.j2 b/roles/docker-storage-setup/templates/docker-storage-setup-overlayfs.j2
deleted file mode 100644
index d8b4a0276..000000000
--- a/roles/docker-storage-setup/templates/docker-storage-setup-overlayfs.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEVS="{{ docker_dev }}"
-VG="{{ docker_vg }}"
-DATA_SIZE="{{ docker_data_size }}"
-STORAGE_DRIVER=overlay2
-CONTAINER_ROOT_LV_NAME="{{ container_root_lv_name }}"
-CONTAINER_ROOT_LV_MOUNT_PATH="{{ container_root_lv_mount_path }}"
-CONTAINER_ROOT_LV_SIZE=100%FREE
-- 
cgit v1.2.3