diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:16:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:16:58 +0000 |
| commit | 34a6d11c0f9606b4a0682d4205f7c11bcf63d386 (patch) | |
| tree | e15ca0fa0acc787c084aa76907bbb4bdb3d8bd65 /docker/centos/binary | |
| parent | 3a9d12e3f2f4bb98f7e9ecff9c9e9cf0ddb4eab2 (diff) | |
| parent | 1581874da634676ae403d30ed063e71dc52c9801 (diff) | |
| download | kolla-34a6d11c0f9606b4a0682d4205f7c11bcf63d386.tar.gz kolla-34a6d11c0f9606b4a0682d4205f7c11bcf63d386.zip | |
Merge "Remove config-internal for Magnum"
Diffstat (limited to 'docker/centos/binary')
7 files changed, 4 insertions, 13 deletions
diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile index 244ca3da1..580ceacc8 100644 --- a/docker/centos/binary/magnum/magnum-api/Dockerfile +++ b/docker/centos/binary/magnum/magnum-api/Dockerfile @@ -5,9 +5,7 @@ RUN yum -y install \ openstack-magnum-api \ && yum clean all -COPY ./start.sh /start.sh -COPY ./check.sh /check.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-api/check.sh b/docker/centos/binary/magnum/magnum-api/check.sh deleted file mode 120000 index 7464ba296..000000000 --- a/docker/centos/binary/magnum/magnum-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/check.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-api/config-internal.sh b/docker/centos/binary/magnum/magnum-api/config-internal.sh deleted file mode 120000 index 7f9cace39..000000000 --- a/docker/centos/binary/magnum/magnum-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile index 16a8a83c5..9928bec88 100644 --- a/docker/centos/binary/magnum/magnum-base/Dockerfile +++ b/docker/centos/binary/magnum/magnum-base/Dockerfile @@ -4,5 +4,3 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) # Magnum is not yet in upstream RDO packaging RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo - -COPY config-magnum.sh /opt/kolla/ diff --git a/docker/centos/binary/magnum/magnum-base/config-magnum.sh b/docker/centos/binary/magnum/magnum-base/config-magnum.sh deleted file mode 120000 index 473c0be8e..000000000 --- a/docker/centos/binary/magnum/magnum-base/config-magnum.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-base/config-magnum.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile index dd19a9d08..093ca5003 100644 --- a/docker/centos/binary/magnum/magnum-conductor/Dockerfile +++ b/docker/centos/binary/magnum/magnum-conductor/Dockerfile @@ -9,8 +9,7 @@ RUN yum -y install \ # 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 -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh deleted file mode 120000 index 1d8f73aa9..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/config-internal.sh
\ No newline at end of file |