openstack/kolla-ansible
Code Issues Proposed changes

fix sahara dockerfile

Browse Source 
1. add sahara sudoer

2. sahara config path is error
   sahara config path is : /sahara/etc/sahara

3. sahara sync db command is error
   sync db command is: sahara-db-manage
   Reference link: http://docs.openstack.org/developer/sahara/userdoc/installation.guide.html

Change-Id: Ic4967248079bb555a2f6c0948782fc3c02d2903d
Closes-Bug: #1609860
This commit is contained in:
zhubingbing 2016-08-04 17:39:12 +00:00
parent 0b7e853784
commit 860e341034
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/sahara/sahara-api/Dockerfile.j2
View File

@ -11,8 +11,8 @@ MAINTAINER {{ maintainer }}
RUN {{ macros.install_packages(sahara_api_packages | customizable("packages")) }} RUN {{ macros.install_packages(sahara_api_packages | customizable("packages")) }}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start
{% block sahara_api_footer %}{% endblock %} {% block sahara_api_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

2
docker/sahara/sahara-api/extend_start.sh
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
sahara-manage db_sync sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
exit 0 exit 0
fi fi

17
docker/sahara/sahara-base/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set sahara_base_packages = ['sahara-common'] %} {% set sahara_base_packages = ['sahara-common'] %}
{% endif %} {% endif %}
RUN {{ macros.install_packages(sahara_base_packages | customizable("packages")) }} {{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
@ -19,12 +19,21 @@ RUN ln -s sahara-base-source/* sahara \
&& useradd --user-group sahara \ && useradd --user-group sahara \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /sahara \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /sahara \
&& mkdir -p /etc/sahara /var/log/sahara /home/sahara \ && mkdir -p /etc/sahara /var/log/sahara /home/sahara \
&& cp -r /sahara/etc/* /etc/sahara/ \ && cp -r /sahara/etc/sahara/* /etc/sahara/ \
&& chown -R sahara: /etc/sahara /var/log/sahara /home/sahara && chown -R sahara: /etc/sahara /var/log/sahara /home/sahara \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/sahara/rootwrap.conf
{% endif %} {% endif %}
RUN usermod -a -G kolla sahara RUN usermod -a -G kolla sahara
COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla sahara \
&& chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \
&& touch /usr/local/bin/kolla_sahara_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
{% block sahara_base_footer %}{% endblock %} {% block sahara_base_footer %}{% endblock %}
{% block footer %}{% endblock %}

1
docker/sahara/sahara-base/sahara_sudoers Normal file
View File

@ -0,0 +1 @@
%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/sahara-rootwrap /etc/sahara/rootwrap.conf *