Merge "Drop root for designate"

This commit is contained in:
Jenkins 2015-11-11 18:35:33 +00:00 committed by Gerrit Code Review
commit d4379a5cde
8 changed files with 15 additions and 1 deletions

View File

@ -14,4 +14,6 @@ RUN yum install -y \
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
USER designate
{{ include_footer }} {{ include_footer }}

View File

@ -3,6 +3,6 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# 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
sudo -H -u designate designate-manage db_sync designate-manage db_sync
exit 0 exit 0
fi fi

View File

@ -12,4 +12,6 @@ RUN yum install -y bind \
{% endif %} {% endif %}
{% endif %} {% endif %}
USER designate
{{ include_footer }} {{ include_footer }}

View File

@ -29,3 +29,5 @@ RUN ln -s designate-base-source/* designate \
&& chown -R designate: /etc/designate /var/log/designate /home/designate && chown -R designate: /etc/designate /var/log/designate /home/designate
{% endif %} {% endif %}
RUN usermod -a -G kolla designate

View File

@ -10,4 +10,6 @@ RUN yum install -y openstack-designate-central \
{% endif %} {% endif %}
{% endif %} {% endif %}
USER designate
{{ include_footer }} {{ include_footer }}

View File

@ -10,4 +10,6 @@ RUN yum install -y openstack-designate-mdns \
{% endif %} {% endif %}
{% endif %} {% endif %}
USER designate
{{ include_footer }} {{ include_footer }}

View File

@ -13,4 +13,6 @@ RUN yum install -y \
{% endif %} {% endif %}
{% endif %} {% endif %}
USER designate
{{ include_footer }} {{ include_footer }}

View File

@ -12,4 +12,6 @@ RUN yum install -y \
{% endif %} {% endif %}
{% endif %} {% endif %}
USER designate
{{ include_footer }} {{ include_footer }}