openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update kubectl version at magnum-conductor container"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 13:39:53 +00:00 committed by Gerrit Code Review
commit 153cd51423
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -5,21 +5,20 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set magnum_conductor_packages = [ {% set magnum_conductor_packages = [
'openstack-magnum-conductor', 'openstack-magnum-conductor'
'tar'
] %} ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set magnum_conductor_packages = ['magnum-conductor'] %} {% set magnum_conductor_packages = [
'magnum-conductor'
] %}
{% endif %} {% endif %}
RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }} RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
# Install kubectl binary (ugh) # Install kubectl binary
RUN cd /tmp \ RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubectl \
&& curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \ && chmod +x /usr/local/bin/kubectl
&& tar -xzvf /tmp/kubernetes.tar.gz \
&& cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \
&& rm -rf /tmp/kubernetes
{% endif %} {% endif %}