diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-09 22:45:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-09 22:45:12 +0000 |
| commit | 667aed114f05d77af515760ff2c8d2db572d7a16 (patch) | |
| tree | 0a229f62cddde6bce5d5afd5feb62fea241e8a7a /docker/centos/binary | |
| parent | ea5dc525f5c28b734e1e96593654d0cea6ed04a1 (diff) | |
| parent | e34b3b68fdd22a26f6e55178f19f0e35364ddc33 (diff) | |
| download | kolla-667aed114f05d77af515760ff2c8d2db572d7a16.tar.gz kolla-667aed114f05d77af515760ff2c8d2db572d7a16.zip | |
Merge "Add config-internal/config-external to Magnum containers"
Diffstat (limited to 'docker/centos/binary')
6 files changed, 9 insertions, 0 deletions
diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile index 84efa2a92..7b0ab74d2 100644 --- a/docker/centos/binary/magnum/magnum-api/Dockerfile +++ b/docker/centos/binary/magnum/magnum-api/Dockerfile @@ -8,4 +8,6 @@ RUN yum -y install \ ADD ./start.sh /start.sh ADD ./check.sh /check.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh new file mode 100644 index 000000000..51d63c9ec --- /dev/null +++ b/docker/centos/binary/magnum/magnum-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-api/config-external.sh diff --git a/docker/centos/binary/magnum/magnum-api/config-internal.sh b/docker/centos/binary/magnum/magnum-api/config-internal.sh new file mode 100644 index 000000000..3637ccaff --- /dev/null +++ b/docker/centos/binary/magnum/magnum-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-api/config-internal.sh diff --git a/docker/centos/binary/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile index f3d506cb8..691d02d09 100644 --- a/docker/centos/binary/magnum/magnum-conductor/Dockerfile +++ b/docker/centos/binary/magnum/magnum-conductor/Dockerfile @@ -10,4 +10,7 @@ RUN yum -y install \ 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 ADD ./start.sh /start.sh + +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh new file mode 100644 index 000000000..a9ca55e4e --- /dev/null +++ b/docker/centos/binary/magnum/magnum-conductor/config-external.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-conductor/config-external.sh diff --git a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh new file mode 100644 index 000000000..b2302e7ae --- /dev/null +++ b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-conductor/config-internal.sh |