From aae1435cb06778a803cb3698f76c24f8611b5f70 Mon Sep 17 00:00:00 2001
From: Damian Cikowski <damian@geo-com.pl>
Date: Fri, 13 Apr 2018 18:33:54 +0200
Subject: [PATCH] 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/617051
Change-Id: I0cb77b1958e586e35458368ec00f4f167d031923
(cherry picked from commit 80c7c23a68229b97080a784b6164ea78d79192d4)
---
 ansible-role-requirements.yml              |  2 +-
 etc/openstack_deploy/conf.d/cinder.yml.aio | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 0dbb7f0b2b..41853a998d 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -69,7 +69,7 @@
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 9cbee44cd3bd125835ab625a09217c7eba9007df
+  version: ad29e977369c676ae2e0026e2d92cb759770a823
 - name: os_designate
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_designate
diff --git a/etc/openstack_deploy/conf.d/cinder.yml.aio b/etc/openstack_deploy/conf.d/cinder.yml.aio
index 67c81e27b2..da2ce9a89f 100644
--- a/etc/openstack_deploy/conf.d/cinder.yml.aio
+++ b/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