correct volume types names with backend mapping
diff --git a/README.rst b/README.rst
index afa04f7..4c0e355 100644
--- a/README.rst
+++ b/README.rst
@@ -40,7 +40,7 @@
backend:
7k2_SAS:
engine: storwize
- name: 7k2 SAS disk
+ type_name: slow-disks
host: 192.168.0.1
port: 22
user: username
@@ -79,7 +79,7 @@
backend:
7k2_SAS:
engine: storwize
- name: 7k2 SAS disk
+ type_name: 7k2 SAS disk
host: 192.168.0.1
port: 22
user: username
@@ -141,7 +141,7 @@
backend:
7k2_SAS:
engine: storwize
- name: 7k2 SAS disk
+ type_name: 7k2 SAS disk
host: 192.168.0.1
port: 22
user: username
@@ -161,7 +161,7 @@
backend:
7k2_SAS:
engine: storwize
- name: 7k2 SAS disk
+ type_name: 7k2 SAS disk
host: 192.168.0.1
port: 22
user: username
@@ -172,7 +172,7 @@
pool: SAS7K2
10k_SAS:
engine: storwize
- name: 10k SAS disk
+ type_name: 10k SAS disk
host: 192.168.0.1
port: 22
user: username
@@ -183,6 +183,7 @@
pool: SAS10K
15k_SAS:
engine: storwize
+ type_name: 15k SAS
host: 192.168.0.1
port: 22
user: username
@@ -215,7 +216,7 @@
enabled: true
backend:
ceph_backend:
- name: standard-iops
+ type_name: standard-iops
backend: ceph_backend
pool: volumes
engine: ceph
@@ -235,7 +236,7 @@
enabled: true
backend:
hp3par_backend:
- name: hp3par
+ type_name: hp3par
backend: hp3par_backend
user: hp3paruser
password: something
@@ -256,7 +257,7 @@
enabled: true
backend:
10kThinPro:
- name: 10kThinPro
+ type_name: 10kThinPro
engine: fujitsu
pool: 10kThinPro
host: 192.168.0.1
@@ -265,7 +266,7 @@
password: pass
connection: FC/iSCSI
10k_SAS:
- name: 10k_SAS
+ type_name: 10k_SAS
pool: SAS10K
engine: fujitsu
host: 192.168.0.1
@@ -283,11 +284,11 @@
enabled: true
backend:
GPFS-GOLD:
- name: GPFS-GOLD
+ type_name: GPFS-GOLD
engine: gpfs
mount_point: '/mnt/gpfs-openstack/cinder/gold'
GPFS-SILVER
- name: GPFS-SILVER
+ type_name: GPFS-SILVER
engine: gpfs
mount_point: '/mnt/gpfs-openstack/cinder/silver'
diff --git a/cinder/controller.sls b/cinder/controller.sls
index c687317..a890055 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -42,15 +42,15 @@
cinder_type_create_{{ backend_name }}:
cmd.run:
- - name: "source /root/keystonerc; cinder type-create {{ backend_name }}"
- - unless: "source /root/keystonerc; cinder type-list | grep {{ backend_name }}"
+ - name: "source /root/keystonerc; cinder type-create {{ backend.type_name }}"
+ - unless: "source /root/keystonerc; cinder type-list | grep {{ backend.type_name }}"
- require:
- service: cinder_controller_services
cinder_type_update_{{ backend_name }}:
cmd.run:
- - name: "source /root/keystonerc; cinder type-key {{ backend_name }} set volume_backend_name={{ backend.get('name', backend_name) }}"
- - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ backend.get('name', backend_name) }}'}\""
+ - name: "source /root/keystonerc; cinder type-key {{ backend.type_name }} set volume_backend_name={{ backend_name }}"
+ - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ backend_name }}'}\""
- require:
- cmd: cinder_type_create_{{ backend_name }}
diff --git a/cinder/files/backend/_ceph.conf b/cinder/files/backend/_ceph.conf
index 75730a1..42151b0 100644
--- a/cinder/files/backend/_ceph.conf
+++ b/cinder/files/backend/_ceph.conf
@@ -1,6 +1,6 @@
[{{ backend_name }}]
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
volume_driver = cinder.volume.drivers.rbd.RBDDriver
#
# Options defined in cinder.volume.drivers.rbd
diff --git a/cinder/files/backend/_fujitsu.conf b/cinder/files/backend/_fujitsu.conf
index f1bb7ec..6245284 100644
--- a/cinder/files/backend/_fujitsu.conf
+++ b/cinder/files/backend/_fujitsu.conf
@@ -1,5 +1,5 @@
[{{ backend_name }}]
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
volume_driver=cinder.volume.drivers.fujitsu.fujitsu_eternus_dx_fc.FJDXFCDriver
cinder_eternus_config_file=/etc/cinder/cinder_fujitsu_eternus_dx_{{ backend.backend }}.xml
\ No newline at end of file
diff --git a/cinder/files/backend/_gpfs.conf b/cinder/files/backend/_gpfs.conf
index 6d6381f..3000c39 100644
--- a/cinder/files/backend/_gpfs.conf
+++ b/cinder/files/backend/_gpfs.conf
@@ -1,6 +1,6 @@
[{{ backend_name }}]
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
volume_driver = cinder.volume.drivers.ibm.gpfs.GPFSDriver
gpfs_mount_point_base={{ backend.mount_point }}
#gpfs_mount_point_base=/mnt/gpfs-openstack/cinder/gold
diff --git a/cinder/files/backend/_hitachi_vsp.conf b/cinder/files/backend/_hitachi_vsp.conf
index c87990a..0f6ae75 100644
--- a/cinder/files/backend/_hitachi_vsp.conf
+++ b/cinder/files/backend/_hitachi_vsp.conf
@@ -1,7 +1,7 @@
[{{ backend_name }}]
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
volume_driver = cinder.volume.drivers.hitachi.hbsd.hbsd_fc.HBSDFCDriver
#
diff --git a/cinder/files/backend/_hp3par.conf b/cinder/files/backend/_hp3par.conf
index 6c217ef..f28a4ba 100644
--- a/cinder/files/backend/_hp3par.conf
+++ b/cinder/files/backend/_hp3par.conf
@@ -1,6 +1,6 @@
[{{ backend_name }}]
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
hp3par_api_url={{ backend.url }}
# 3PAR Super user username
diff --git a/cinder/files/backend/_storwize.conf b/cinder/files/backend/_storwize.conf
index b712a50..1f09fca 100644
--- a/cinder/files/backend/_storwize.conf
+++ b/cinder/files/backend/_storwize.conf
@@ -1,7 +1,7 @@
[{{ backend_name }}]
volume_driver = cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver
-volume_backend_name={{ backend.get('name', backend_name) }}
+volume_backend_name={{ backend_name }}
san_ip={{ backend.host }}
san_ssh_port={{ backend.port }}
san_login={{ backend.user }}