11 files changed, 0 insertions, 95 deletions
diff --git a/ansible/roles/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml
deleted file mode 100644
index 0a2a56dff..000000000
--- a/ansible/roles/multipathd/defaults/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-project_name: "multipathd"
-
-####################
-# Docker
-####################
-multipathd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-multipathd"
-multipathd_tag: "{{ openstack_release }}"
-multipathd_image_full: "{{ multipathd_image }}:{{ multipathd_tag }}"
diff --git a/ansible/roles/multipathd/tasks/config.yml b/ansible/roles/multipathd/tasks/config.yml
deleted file mode 100644
index a831b32a6..000000000
--- a/ansible/roles/multipathd/tasks/config.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  when: inventory_hostname in groups['compute']
-  with_items:
-    - "multipathd"
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  when: inventory_hostname in groups['compute']
-  with_items:
-    - "multipathd"
-
-- name: Copying over multipath.conf
-  template:
-    src: "{{ role_path }}/templates/multipath.conf.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/multipath.conf"
-  with_items:
-    - "multipathd"
diff --git a/ansible/roles/multipathd/tasks/deploy.yml b/ansible/roles/multipathd/tasks/deploy.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/multipathd/tasks/deploy.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/multipathd/tasks/main.yml b/ansible/roles/multipathd/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/multipathd/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/multipathd/tasks/precheck.yml b/ansible/roles/multipathd/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/multipathd/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/multipathd/tasks/pull.yml b/ansible/roles/multipathd/tasks/pull.yml
deleted file mode 100644
index 41d70f65e..000000000
--- a/ansible/roles/multipathd/tasks/pull.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Pulling multipathd image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ multipathd_image_full }}"
-  when: inventory_hostname in groups['multipathd']
diff --git a/ansible/roles/multipathd/tasks/reconfigure.yml b/ansible/roles/multipathd/tasks/reconfigure.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/multipathd/tasks/reconfigure.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/multipathd/tasks/start.yml b/ansible/roles/multipathd/tasks/start.yml
deleted file mode 100644
index 2bf69eab2..000000000
--- a/ansible/roles/multipathd/tasks/start.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Starting multipathd container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ multipathd_image_full }}"
-    name: "multipathd"
-    ipc_mode: "host"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/multipathd/:{{ container_config_directory }}/:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/dev/:/dev/"
-      - "/run/:/run/:shared"
-      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/sys/kernel/config:/configfs"
-      - "cinder:/var/lib/cinder"
-      - "iscsi_info:/etc/iscsi"
-  when: inventory_hostname in groups['compute']
diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/multipathd/tasks/upgrade.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/multipathd/templates/multipath.conf.j2 b/ansible/roles/multipathd/templates/multipath.conf.j2
deleted file mode 100644
index d063f31a8..000000000
--- a/ansible/roles/multipathd/templates/multipath.conf.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-defaults {
-   user_friendly_names no
-   polling_interval  30
-}
-
-blacklist {
-    devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
-    devnode "^sd[a]"
-    devnode "^hd[a-z]"
-    devnode "^cciss!c[0-9]d[0-9]*"
-}
diff --git a/ansible/roles/multipathd/templates/multipathd.json.j2 b/ansible/roles/multipathd/templates/multipathd.json.j2
deleted file mode 100644
index 2570a607e..000000000
--- a/ansible/roles/multipathd/templates/multipathd.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "/sbin/multipathd -d",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/multipath.conf",
-            "dest": "/etc/multipath.conf",
-            "owner": "root",
-            "perm": "0600"
-        }
-    ]
-}