Merge "Fix issues in Glance filesystem backend"

ansible/roles/glance/tasks/start.yml

@@ -16,8 +16,6 @@
     volumes:
       - "{{ node_config_directory }}/glance-registry/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
-    volumes_from:
-      - glance_data
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['glance-registry']
@@ -39,6 +37,8 @@
     volumes:
       - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
+    volumes_from:
+      - glance_data
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['glance-api']

docker/glance/glance-api/extend_start.sh

@@ -4,5 +4,6 @@
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     glance-manage db_sync
+    sudo chown -R glance: /var/lib/glance/
     exit 0
 fi

docker/glance/glance-base/Dockerfile.j2

@@ -44,4 +44,8 @@ RUN ln -s glance-base-source/* glance \
 
 {% endif %}
 
-RUN usermod -a -G kolla glance
+COPY glance_sudoers /etc/sudoers.d/glance_sudoers
+
+RUN usermod -a -G kolla glance \
+    && chmod 750 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d/glance_sudoers

docker/glance/glance-base/glance_sudoers

@@ -0,0 +1 @@
+%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R glance\: /var/lib/glance/, /bin/chown -R glance\: /var/lib/glance/