diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index ed5e7205202354ccad9b9f05be727b14dcf23bfe..f800b0f3730b42154f710ef0cb58edfb1a548b8e 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/ansible/roles/magnum/defaults/main.yml @@ -42,6 +42,9 @@ magnum_database_address: "{{ database_address }}:{{ database_port }}" # Magnum #################### enable_cluster_user_trust: False +# The default cinder volume type to be used for container storage volume in clusters +# that specify the docker-volume-size option. For example gp1, io1 etc +default_docker_volume_type: "" #################### diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index b30ca401bb9c1580e90965f28349ba9dad558b58..699237acb658f720a5e15f33f06a5a8883b03fa7 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -18,6 +18,11 @@ workers = {{ openstack_service_workers }} connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address }}/{{ magnum_database_name }} max_retries = -1 +{% if enable_cinder | bool %} +[cinder] +default_docker_volume_type = {{ default_docker_volume_type }} +{% endif %} + [heat_client] region_name = {{ openstack_region_name }} endpoint_type = internalURL diff --git a/releasenotes/notes/default_docker_volume_type-251636f92cb73aee.yaml b/releasenotes/notes/default_docker_volume_type-251636f92cb73aee.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7ee58c702475a600cca1fe0dc7bef3e7cbe0afd5 --- /dev/null +++ b/releasenotes/notes/default_docker_volume_type-251636f92cb73aee.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Added default_docker_volume_type for magnum which is required to + specify the default cinder volume type to be used for container + storage volume in clusters that specify the docker-volume-size + option. For example gp1, io1 etc.