openstack/openstack-ansible
Code Issues Proposed changes

Merge "Automate setting of glance_api_version"

Browse Source
This commit is contained in:
Jenkins 2016-02-26 16:04:19 +00:00 committed by Gerrit Code Review
commit 8a14d2fee6
4 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/openstack_deploy/openstack_user_config.yml.example
View File

@ -615,7 +615,6 @@
# rbd_max_clone_depth: 5
# rbd_store_chunk_size: 4
# rados_connect_timeout: -1
# glance_api_version: 2
# volume_backend_name: volumes_hdd
# rbd_user: "{{ cinder_ceph_client }}"
# rbd_secret_uuid: "{{ cinder_ceph_client_uuid }}"

1
playbooks/inventory/group_vars/hosts.yml
View File

@ -240,6 +240,7 @@ cinder_service_region: "{{ service_region }}"
cinder_service_in_ldap: "{{ service_ldap_backend_enabled }}"
cinder_rabbitmq_userid: cinder
cinder_rabbitmq_vhost: /cinder
cinder_glance_api_version: "{{ (cinder_backends_rbd_inuse|bool and glance_default_store == 'rbd') | ternary('2','1') }}"
## Swift

1
playbooks/roles/os_cinder/defaults/main.yml
View File

@ -213,6 +213,7 @@ cinder_quota_backup_gigabytes: 1000
cinder_glance_host: 127.0.0.1
cinder_glance_service_port: 9292
cinder_glance_api_version: 1
cinder_service_in_ldap: false

1
playbooks/roles/os_cinder/templates/cinder.conf.j2
View File

@ -68,6 +68,7 @@ glance_host = {{ cinder_glance_host }}
glance_port = {{ cinder_glance_service_port }}
{% endif %}
glance_num_retries = 0
glance_api_version = {{ cinder_glance_api_version }}
volume_clear = {{ cinder_volume_clear }}
volume_clear_size = {{ cinder_volume_clear_size }}