diff options
Diffstat (limited to 'docker/magnum')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/magnum/magnum-api/extend_start.sh (renamed from docker/magnum/magnum-api/start.sh) | 9 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 13 | ||||
| -rwxr-xr-x | docker/magnum/magnum-conductor/start.sh | 10 |
4 files changed, 7 insertions, 34 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 81d44e69f..3a613ab34 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -5,15 +5,12 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-magnum-api \ - && yum clean all + && yum clean all {% endif %} {% endif %} -COPY ./start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] - +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} diff --git a/docker/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/extend_start.sh index dc22cd1c6..fae394185 100755..100644 --- a/docker/magnum/magnum-api/start.sh +++ b/docker/magnum/magnum-api/extend_start.sh @@ -1,11 +1,4 @@ #!/bin/bash -set -o errexit - -CMD="/usr/bin/magnum-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then su -s /bin/sh -c "magnum-manage db_sync" magnum exit 0 fi - -exec $CMD $ARGS diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index bfd9ca32d..4e9eaef43 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -4,9 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install openstack-magnum-conductor \ - tar \ - && yum clean all +RUN yum -y install \ + openstack-magnum-conductor \ + tar \ + && yum clean all # 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 && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes @@ -14,10 +15,4 @@ RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/release {% endif %} {% endif %} -COPY ./start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] - - {{ include_footer }} diff --git a/docker/magnum/magnum-conductor/start.sh b/docker/magnum/magnum-conductor/start.sh deleted file mode 100755 index b96c6324f..000000000 --- a/docker/magnum/magnum-conductor/start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/magnum-conductor" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -exec $CMD $ARGS |
