Add manila container (source only)

Support manila as container. First step only supports
building from source.

Change-Id: I60bb67536c9afdb9f0532b3cdc2c400a68608003
Partially-Implements: blueprint enable-manila-containers
This commit is contained in:
Marc Koderer 2016-01-18 11:46:29 +01:00
parent 3f064206b8
commit f7085c1f6f
7 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,9 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
{{ include_footer }}
USER manila

View File

@ -0,0 +1,9 @@
#!/bin/bash
set -o errexit
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
manila-manage db sync
exit 0
fi

View File

@ -0,0 +1,21 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \
&& useradd --user-group manila \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /manila \
&& mkdir -p /etc/manila /var/log/manila /home/manila \
&& cp -r /manila/etc/manila/* /etc/manila/ \
&& chown -R manila: /etc/manila /var/log/manila /home/manila
{% endif %}
RUN usermod -a -G kolla manila

View File

@ -0,0 +1,6 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{{ include_footer }}
USER manila

View File

@ -0,0 +1,6 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{{ include_footer }}
USER manila

View File

@ -187,6 +187,10 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('http://tarballs.openstack.org/magnum/' 'location': ('http://tarballs.openstack.org/magnum/'
'magnum-master.tar.gz')}, 'magnum-master.tar.gz')},
'manila-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/manila/'
'manila-master.tar.gz')},
'mistral-base': { 'mistral-base': {
'type': 'url', 'type': 'url',
'location': ('http://tarballs.openstack.org/mistral/' 'location': ('http://tarballs.openstack.org/mistral/'

View File

@ -47,7 +47,8 @@ class BuildTest(base.BaseTestCase):
"murano-base", "murano-base",
"ironic-pxe", "ironic-pxe",
"ironic-discoverd", "ironic-discoverd",
"mistral-base"] "mistral-base",
"manila-base"]
failures = 0 failures = 0
for image, result in six.iteritems(bad_results): for image, result in six.iteritems(bad_results):