Move iSCSI config to the iSCSI playbooks

Change-Id: Id16bd2fa16933112c77b3084b3c925c60ba47f25
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 5e7872b..2ec5e5d 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -147,8 +147,10 @@
         secret: STORPOOL_DEPLOY_KEY_PUB
       - name: STORPOOL_INVENTORY
         secret: STORPOOL_INVENTORY
-      - name: STORPOOL_NETPLAN
-        secret: STORPOOL_NETPLAN
+      - name: STORPOOL_ISCSI_NETPLAN
+        secret: STORPOOL_ISCSI_NETPLAN
+      - name: STORPOOL_STORPOOL_NETPLAN
+        secret: STORPOOL_STORPOOL_NETPLAN
       - name: STORPOOL_NETPLAN_SERVICE
         secret: STORPOOL_NETPLAN_SERVICE
       - name: STORPOOL_CONF
@@ -256,8 +258,10 @@
         secret: STORPOOL_DEPLOY_KEY_PUB
       - name: STORPOOL_INVENTORY
         secret: STORPOOL_INVENTORY
-      - name: STORPOOL_NETPLAN
-        secret: STORPOOL_NETPLAN
+      - name: STORPOOL_ISCSI_NETPLAN
+        secret: STORPOOL_ISCSI_NETPLAN
+      - name: STORPOOL_STORPOOL_NETPLAN
+        secret: STORPOOL_STORPOOL_NETPLAN
       - name: STORPOOL_NETPLAN_SERVICE
         secret: STORPOOL_NETPLAN_SERVICE
       - name: STORPOOL_CONF
@@ -283,8 +287,10 @@
             branches: master
 #        - cinder-storpool-tempest-iscsi-multipath:
 #            branches: master
-#    experimental:
-#      jobs:
+    experimental:
+      jobs:
+        - cinder-storpool-tempest-iscsi-multipath:
+            branches: master
 #        #- cinder-storpool-tempest-experimental:
 #        #    branches: master
 #        #- cinder-storpool-tempest-iscsi: