Pin Glance to Juno master and update configs

Move all Swift info to the bottom of the DEFAULT options section

Because there is now a glance_store section, having that in the middle of the
swift store conditional caused the filesystem options to be moved out of
the DEFAULT scope. This makes sure everything is in the right section.

rpc_deployment/inventory/group_vars/glance_all.yml

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

rpc_deployment/roles/glance_common/templates/glance-api.conf

@@ -33,6 +33,13 @@ rabbit_notification_topic = notifications
 rabbit_durable_queues = False
 {% 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" %}
 ##### STORE OPTIONS #####
 swift_store_auth_version = 2
@@ -48,12 +55,6 @@ swift_store_retry_get_count = 5
 swift_store_endpoint_type = {{ swift_store_endpoint_type }}
 {% 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]
 signing_dir = /var/lib/glance/cache/api
 identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}