kolla: Fix issues
Change-Id: I498cb9f15f1d7997879785075989f0e71fdb1d0e
diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/cinder.conf b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/cinder.conf
new file mode 100644
index 0000000..bb23205
--- /dev/null
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/cinder.conf
@@ -0,0 +1,13 @@
+[DEFAULT]
+enabled_backends = lvm-1, storpool
+
+[storpool]
+volume_driver = cinder.volume.drivers.storpool.StorPoolDriver
+volume_backend_name = storpool
+iscsi_portal_group = pg
+iscsi_export_to = *
+storpool_template = virtual
+iscsi_cinder_volume = True
+#image_upload_use_cinder_backend = True
+#image_upload_use_internal_tenant = True
+#use_multipath_for_image_xfer = false
\ No newline at end of file
diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
index e1504be..2340c4d 100644
--- a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
@@ -190,6 +190,20 @@
src: globals.yml.j2
dest: /etc/kolla/globals.yml
+ - name: Create the /etc/kolla/config Directory
+ become: true
+ ansible.builtin.file:
+ path: /etc/kolla/config
+ state: directory
+ mode: '0755'
+ owner: "{{ ansible_user }}"
+ group: "{{ ansible_user }}"
+
+ - name: Copy cinder.conf to /etc/kolla/config
+ ansible.builtin.copy:
+ src: cinder.conf
+ dest: /etc/kolla/config/cinder.conf
+
- name: Install Ansible Galaxy Requirements
shell: . {{ kolla_venv }}/bin/activate && LC_ALL=en_US.UTF-8 kolla-ansible install-deps
@@ -247,8 +261,8 @@
loop:
# 64MB is not enough for recent Cirros images: https://github.com/cirros-dev/cirros/issues/63
#- openstack --os-cloud kolla-admin flavor create --id auto --ram 64 --disk 1 --vcpus 1 m1.nano
- - openstack --os-cloud kolla-admin flavor create --id auto --ram 128 --disk 1 --vcpus 1 m1.nano
- - openstack --os-cloud kolla-admin flavor create --id auto --ram 256 --disk 1 --vcpus 1 m1.micro
+ - openstack --os-cloud kolla-admin flavor create --id 101 --ram 128 --disk 1 --vcpus 1 m1.nano
+ - openstack --os-cloud kolla-admin flavor create --id 102 --ram 256 --disk 1 --vcpus 1 m1.micro
- name: Create a Tempest Venv
ansible.builtin.pip: