diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-14 16:39:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-14 16:39:16 +0000 |
| commit | 75892362e1578430e97794f7d90a9dd26f0a4dd9 (patch) | |
| tree | a61dfd1630e924f3d78320715e785a08a9f6dd67 /docker | |
| parent | 11708962aa3ee3a5e6350ffe32ee9e7792393377 (diff) | |
| parent | e759d4d53964755b261d2236b498e881bd49467b (diff) | |
| download | kolla-75892362e1578430e97794f7d90a9dd26f0a4dd9.tar.gz kolla-75892362e1578430e97794f7d90a9dd26f0a4dd9.zip | |
Merge "Fix kuryr docker images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-base/extend_start.sh | 6 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 16 |
3 files changed, 24 insertions, 5 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index 8611a64a9..a7ed3bc09 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -5,6 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='kuryr') }} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ @@ -22,8 +24,9 @@ ADD kuryr-base-archive /kuryr-base-source # Otherwise, it will be failed. RUN ln -s kuryr-base-source/* kuryr-base \ && sed -i 's|^kuryr-lib===.*$||g' requirements/upper-constraints.txt \ - && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} - + && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/kuryr \ + && chown -R kuryr: /etc/kuryr {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh index 214675bea..b109ce4f6 100644 --- a/docker/kuryr/kuryr-base/extend_start.sh +++ b/docker/kuryr/kuryr-base/extend_start.sh @@ -1,6 +1,7 @@ #!/bin/bash KURYR_LOG_DIR=/var/log/kolla/kuryr +KURYR_DOCKER_PLUGINS_DIR=/usr/lib/docker/plugins/kuryr if [[ ! -d "${KURYR_LOG_DIR}" ]]; then mkdir -p ${KURYR_LOG_DIR} @@ -9,7 +10,6 @@ if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then chmod 755 ${KURYR_LOG_DIR} fi -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - mkdir -p /usr/lib/docker/plugins/kuryr - exit 0 +if [[ ! -d "${KURYR_DOCKER_PLUGINS_DIR}" ]]; then + mkdir -p ${KURYR_DOCKER_PLUGINS_DIR} fi diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 18729576a..7cd9aca24 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -11,6 +11,22 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set kuryr_libnetwork_packages = [ + 'bridge-utils', + 'openvswitch' + ] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + + {% set kuryr_libnetwork_packages = [ + 'bridge-utils', + 'openvswitch-switch' + ] %} + + {% endif %} +{{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }} ADD kuryr-libnetwork-archive /kuryr-libnetwork-source |