From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 16 Jul 2015 20:14:19 +0000 (-0500)
Subject: testnode: remove scsci-target-utils and iscsi-initiator-utils
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d600bc7e851a39a0edaa28ad52674c6b2cdfd63;p=ceph-cm-ansible.git

testnode: remove scsci-target-utils and iscsi-initiator-utils

We don't want to install these anymore as they're causing issues with
the teuthology install task because of their dependency on librados.

See: http://tracker.ceph.com/issues/12371

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/testnode/vars/centos_6.yml b/roles/testnode/vars/centos_6.yml
index a10d2bbf..d87859f9 100644
--- a/roles/testnode/vars/centos_6.yml
+++ b/roles/testnode/vars/centos_6.yml
@@ -125,13 +125,6 @@ packages:
   # for java bindings, hadoop, etc.
   - java-1.7.0-openjdk-devel
   - junit4
-  ###
-  # tgt & open-iscsi
-  # installing these 2 packages makes this playbook
-  # not idempotent on rhel 6.x and centos 6.x
-  # see: http://tracker.ceph.com/issues/11216
-  - scsi-target-utils
-  - iscsi-initiator-utils
   # for disk/etc monitoring
   - smartmontools
   # for nfs
diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index ea23ac32..97fb5a15 100644
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -89,13 +89,6 @@ packages:
   # for java bindings, hadoop, etc.
   - java-1.6.0-openjdk-devel
   - junit4
-  ###
-  # tgt & open-iscsi
-  # installing these 2 packages makes this playbook
-  # not idempotent on rhel 6.x
-  # see: http://tracker.ceph.com/issues/11216
-  - scsi-target-utils
-  - iscsi-initiator-utils
   # for disk/etc monitoring
   - smartmontools
   # for nfs
diff --git a/roles/testnode/vars/fedora_20.yml b/roles/testnode/vars/fedora_20.yml
index 4e577729..b178b712 100644
--- a/roles/testnode/vars/fedora_20.yml
+++ b/roles/testnode/vars/fedora_20.yml
@@ -93,13 +93,6 @@ packages:
   # for java bindings, hadoop, etc.
   - java-1.7.0-openjdk-devel
   - junit4
-  ###
-  # tgt & open-iscsi
-  # installing these 2 packages makes this playbook
-  # not idempotent on rhel 6.x and centos 6.x
-  # see: http://tracker.ceph.com/issues/11216
-  - scsi-target-utils
-  - iscsi-initiator-utils
   # for disk/etc monitoring
   - smartmontools
   # for nfs
diff --git a/roles/testnode/vars/redhat_6.yml b/roles/testnode/vars/redhat_6.yml
index c743e880..d3f18dbe 100644
--- a/roles/testnode/vars/redhat_6.yml
+++ b/roles/testnode/vars/redhat_6.yml
@@ -114,13 +114,6 @@ packages:
   # for java bindings, hadoop, etc.
   - java-1.6.0-openjdk-devel
   - junit4
-  ###
-  # tgt & open-iscsi
-  # installing these 2 packages makes this playbook
-  # not idempotent on rhel 6.x and centos 6.x
-  # see: http://tracker.ceph.com/issues/11216
-  - scsi-target-utils
-  - iscsi-initiator-utils
   # for disk/etc monitoring
   - smartmontools
   # for nfs
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index 4441ea28..054c8439 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -74,8 +74,6 @@ packages:
   - perl-XML-Twig
   - java-1.6.0-openjdk-devel
   - junit4
-  - scsi-target-utils
-  - iscsi-initiator-utils
   - smartmontools
   - nfs-utils
   # for xfstests