Merge "Add support for magnum ubuntu binary containers"

This commit is contained in:
Jenkins 2016-05-27 21:17:43 +00:00 committed by Gerrit Code Review
commit cd4602819c
4 changed files with 20 additions and 2 deletions

View File

@ -8,6 +8,12 @@ RUN yum -y install \
openstack-magnum-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
magnum-api\
&& apt-get clean
{% endif %}
{% endif %}

View File

@ -9,6 +9,12 @@ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/y
openstack-magnum-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
magnum-common \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}

View File

@ -9,6 +9,14 @@ RUN yum -y install \
tar \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
magnum-conductor\
&& apt-get clean
{% endif %}
# Install kubectl binary (ugh)
RUN cd /tmp \
&& curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \
@ -16,7 +24,6 @@ RUN cd /tmp \
&& cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \
&& rm -rf /tmp/kubernetes
{% endif %}
{% endif %}
{{ include_footer }}

View File

@ -89,7 +89,6 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
excluded_images = ["mistral-base",
"magnum-base",
"zaqar"]
def setUp(self):