Add extra volume types to AIO

This change adds example volume types in AIO. It will allow tests to
enter code paths that create volume types and associate QoS specs.

Depends-On: https://review.openstack.org/617052
Change-Id: I0cb77b1958e586e35458368ec00f4f167d031923
(cherry picked from commit 80c7c23a68)

ansible-role-requirements.yml

@@ -69,7 +69,7 @@
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: b7a2f36f2230f041957685a28b28371f5d14e05e
+  version: e80c0ca5e8c6fd1b9341dffa013044163e9cec70
 - name: os_designate
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_designate

etc/openstack_deploy/conf.d/cinder.yml.aio

@@ -2,6 +2,29 @@
 storage-infra_hosts:
   aio1:
     ip: 172.29.236.100
+    container_vars:
+      cinder_qos_specs:
+        - name: low-iops
+          options:
+            consumer: front-end
+            read_iops_sec: 75
+            write_iops_sec: 75
+          cinder_volume_types:
+            - low-iops
+        - name: high-iops
+          options:
+            consumer: front-end
+            read_iops_sec: 150
+            write_iops_sec: 150
+          cinder_volume_types:
+            - high-iops
+        - name: ultra-high-iops
+          options:
+            consumer: front-end
+            read_iops_sec: 300
+            write_iops_sec: 300
+          cinder_volume_types:
+            - ultra-high-iops
 
 storage_hosts:
   aio1:
@@ -15,3 +38,7 @@ storage_hosts:
           volume_backend_name: LVM_iSCSI
           iscsi_ip_address: "172.29.236.100"
           lvm_type: "thin"
+          extra_volume_types:
+            - low-iops
+            - high-iops
+            - ultra-high-iops