12 files changed, 0 insertions, 135 deletions
diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml
deleted file mode 100644
index 9af4cbbd3..000000000
--- a/ansible/roles/iscsi/defaults/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-project_name: "iscsi"
-
-####################
-# Docker
-####################
-iscsid_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-iscsid"
-iscsid_tag: "{{ openstack_release }}"
-iscsid_image_full: "{{ iscsid_image }}:{{ iscsid_tag }}"
-
-tgtd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-tgtd"
-tgtd_tag: "{{ openstack_release }}"
-tgtd_image_full: "{{ tgtd_image }}:{{ tgtd_tag }}"
diff --git a/ansible/roles/iscsi/meta/main.yml b/ansible/roles/iscsi/meta/main.yml
deleted file mode 100644
index 6b4fff8fe..000000000
--- a/ansible/roles/iscsi/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: common }
diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml
deleted file mode 100644
index 0ebe3dd74..000000000
--- a/ansible/roles/iscsi/tasks/config.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  when: inventory_hostname in groups['compute'] or
-        inventory_hostname in groups['storage']
-  with_items:
-    - "iscsid"
-
-- 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'] or
-        inventory_hostname in groups['storage']
-  with_items:
-    - "iscsid"
-
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  when:
-    - inventory_hostname in groups['tgtd']
-    - enable_cinder_backend_lvm | bool
-  with_items:
-    - "tgtd"
-
-- 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['tgtd']
-    - enable_cinder_backend_lvm | bool
-  with_items:
-    - "tgtd"
diff --git a/ansible/roles/iscsi/tasks/deploy.yml b/ansible/roles/iscsi/tasks/deploy.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/iscsi/tasks/deploy.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/iscsi/tasks/main.yml b/ansible/roles/iscsi/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/iscsi/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/iscsi/tasks/precheck.yml b/ansible/roles/iscsi/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/iscsi/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/iscsi/tasks/pull.yml b/ansible/roles/iscsi/tasks/pull.yml
deleted file mode 100644
index df84c86cc..000000000
--- a/ansible/roles/iscsi/tasks/pull.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Pulling iscsid image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ iscsid_image_full }}"
-  when: inventory_hostname in groups['iscsid']
-
-- name: Pulling tgtd image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ tgtd_image_full }}"
-  when: inventory_hostname in groups['tgtd']
diff --git a/ansible/roles/iscsi/tasks/reconfigure.yml b/ansible/roles/iscsi/tasks/reconfigure.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/iscsi/tasks/reconfigure.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/iscsi/tasks/start.yml b/ansible/roles/iscsi/tasks/start.yml
deleted file mode 100644
index f1135188a..000000000
--- a/ansible/roles/iscsi/tasks/start.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- name: Starting iscsid container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ iscsid_image_full }}"
-    name: "iscsid"
-    ipc_mode: "host"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/iscsid/:{{ 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'] or
-        inventory_hostname in groups['storage']
-
-- name: Starting tgtd container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ tgtd_image_full }}"
-    name: "tgtd"
-    ipc_mode: "host"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/tgtd/:{{ 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['tgtd']
-    - enable_cinder_backend_lvm | bool
diff --git a/ansible/roles/iscsi/tasks/upgrade.yml b/ansible/roles/iscsi/tasks/upgrade.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/iscsi/tasks/upgrade.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/iscsi/templates/iscsid.json.j2 b/ansible/roles/iscsi/templates/iscsid.json.j2
deleted file mode 100644
index f44cf16c9..000000000
--- a/ansible/roles/iscsi/templates/iscsid.json.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "command": "iscsid -d 8 -f --pid=/run/iscsid.pid",
-    "config_files": []
-}
diff --git a/ansible/roles/iscsi/templates/tgtd.json.j2 b/ansible/roles/iscsi/templates/tgtd.json.j2
deleted file mode 100644
index 3f38ef996..000000000
--- a/ansible/roles/iscsi/templates/tgtd.json.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "command": "tgtd -d 1 -f --iscsi portal={{ api_interface_address }}:{{ iscsi_port }}",
-    "config_files": []
-}