Rename StorPool playbook

Change-Id: I125afae3c76b59a6c1184db4988d38fe12fe1943
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml b/playbooks/setup-openstack-storpool/post.yaml
similarity index 100%
rename from playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
rename to playbooks/setup-openstack-storpool/post.yaml
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml b/playbooks/setup-openstack-storpool/pre.yaml
similarity index 100%
rename from playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
rename to playbooks/setup-openstack-storpool/pre.yaml
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/vars.yaml b/playbooks/setup-openstack-storpool/vars.yaml
similarity index 100%
rename from playbooks/setup-openstack-iscsi-multipath-storpool/vars.yaml
rename to playbooks/setup-openstack-storpool/vars.yaml
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 5de6cd5..2eaebfd 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -32,10 +32,10 @@
     pre-run:
       - playbooks/sp-init.yaml
       - playbooks/setup-openstack-client/pre.yaml
-      - playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
     run: playbooks/tempest-and-cinderlib-run.yaml
     cleanup-run:
-      - playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
+      - playbooks/setup-openstack-storpool/post.yaml
       - playbooks/setup-openstack-client/post.yaml
       - playbooks/sp-cleanup.yaml
     required-projects:
@@ -152,10 +152,10 @@
       - playbooks/sp-init.yaml
       - playbooks/setup-openstack-client/pre.yaml
       - playbooks/setup-openstack-iscsi-multipath/pre.yaml
-      - playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
     run: playbooks/tempest-and-cinderlib-run.yaml
     cleanup-run:
-      - playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
+      - playbooks/setup-openstack-storpool/post.yaml
       - playbooks/setup-openstack-iscsi-multipath/post.yaml
       - playbooks/setup-openstack-client/post.yaml
       - playbooks/sp-cleanup.yaml
@@ -269,12 +269,12 @@
     pre-run:
       - playbooks/setup-openstack-client/pre.yaml
       - playbooks/setup-openstack-iscsi-multipath/pre.yaml
-      - playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
+      - playbooks/setup-openstack-storpool/pre.yaml
       - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
     run: playbooks/kolla-setup-openstack-iscsi-multipath-storpool/run.yaml
     cleanup-run:
       - playbooks/kolla-setup-openstack-iscsi-multipath-storpool/post.yaml
-      - playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
+      - playbooks/setup-openstack-storpool/post.yaml
       - playbooks/setup-openstack-iscsi-multipath/post.yaml
       - playbooks/setup-openstack-client/post.yaml
     required-projects: