openstack/openstack-ansible
Code Issues Proposed changes

Merge pull request #174 from nrb/glance_juno

Browse Source 
Glance juno
This commit is contained in:
Kevin Carter 2014-09-29 12:26:15 -05:00
commit 51dbe57f6e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc_deployment/inventory/group_vars/glance_all.yml
View File

@ -76,7 +76,7 @@ flavor: "keystone+cachemanagement"
git_repo: https://git.openstack.org/openstack/glance git_repo: https://git.openstack.org/openstack/glance
git_fallback_repo: https://github.com/openstack/glance git_fallback_repo: https://github.com/openstack/glance
git_etc_example: etc/ git_etc_example: etc/
git_install_branch: d0453ae453adeacf19d121f08f8f9691f11f435a git_install_branch: master
service_pip_dependencies: service_pip_dependencies:
- warlock - warlock

13
rpc_deployment/roles/glance_common/templates/glance-api.conf
View File

@ -33,6 +33,13 @@ rabbit_notification_topic = notifications
rabbit_durable_queues = False rabbit_durable_queues = False
{% endif %} {% endif %}
filesystem_store_datadir = /var/lib/glance/images/
delayed_delete = False
scrub_time = 43200
scrubber_datadir = /var/lib/glance/scrubber/
image_cache_dir = /var/lib/glance/cache/
{% if default_store == "swift" %} {% if default_store == "swift" %}
##### STORE OPTIONS ##### ##### STORE OPTIONS #####
swift_store_auth_version = 2 swift_store_auth_version = 2
@ -48,12 +55,6 @@ swift_store_retry_get_count = 5
swift_store_endpoint_type = {{ swift_store_endpoint_type }} swift_store_endpoint_type = {{ swift_store_endpoint_type }}
{% endif %} {% endif %}
filesystem_store_datadir = /var/lib/glance/images/
delayed_delete = False
scrub_time = 43200
scrubber_datadir = /var/lib/glance/scrubber/
image_cache_dir = /var/lib/glance/cache/
[keystone_authtoken] [keystone_authtoken]
signing_dir = /var/lib/glance/cache/api signing_dir = /var/lib/glance/cache/api
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}