openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix issues in Glance filesystem backend"

Browse Source
This commit is contained in:
Jenkins 2015-11-17 19:36:03 +00:00 committed by Gerrit Code Review
commit cb96171ef8
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/glance/tasks/start.yml
View File

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

1
docker/glance/glance-api/extend_start.sh
View File

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

6
docker/glance/glance-base/Dockerfile.j2
View File

@ -44,4 +44,8 @@ RUN ln -s glance-base-source/* glance \
{% endif %} {% 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

1
docker/glance/glance-base/glance_sudoers Normal file
View File

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