openstack/kolla-ansible
Code Issues Proposed changes

Merge "Include default_docker_volume_type for magnum.conf"

Browse Source
This commit is contained in:
Zuul 2018-08-24 05:36:04 +00:00 committed by Gerrit Code Review
commit 140180178b
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/magnum/defaults/main.yml
View File

@ -42,6 +42,9 @@ magnum_database_address: "{{ database_address }}:{{ database_port }}"
# Magnum # Magnum
#################### ####################
enable_cluster_user_trust: False 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: ""
#################### ####################

5
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -18,6 +18,11 @@ workers = {{ openstack_service_workers }}
connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address }}/{{ magnum_database_name }} connection = mysql+pymysql://{{ magnum_database_user }}:{{ magnum_database_password }}@{{ magnum_database_address }}/{{ magnum_database_name }}
max_retries = -1 max_retries = -1
{% if enable_cinder | bool %}
[cinder]
default_docker_volume_type = {{ default_docker_volume_type }}
{% endif %}
[heat_client] [heat_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL

7
releasenotes/notes/default_docker_volume_type-251636f92cb73aee.yaml Normal file
View File

@ -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.