diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 03:27:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 03:27:51 +0000 |
| commit | eba77f7781eb30f6334dd253ae86c8ef50977c59 (patch) | |
| tree | 1e7ceb23addf73ffc7c985eea83226bd20cb4344 /docker/centos | |
| parent | d40294f0ca68e2b1ec9caff2f136dd32ab976ac1 (diff) | |
| parent | b07bb59c2d0ec5c8f2d3fd36a7c85e3d63bb31f3 (diff) | |
| download | kolla-eba77f7781eb30f6334dd253ae86c8ef50977c59.tar.gz kolla-eba77f7781eb30f6334dd253ae86c8ef50977c59.zip | |
Merge "Add config-internal/config-external to Heat containers"
Diffstat (limited to 'docker/centos')
9 files changed, 13 insertions, 0 deletions
diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile index 18a7e369d..b26302a4f 100644 --- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile +++ b/docker/centos/binary/heat/heat-api-cfn/Dockerfile @@ -9,4 +9,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/heat/heat-api-cfn/config-external.sh b/docker/centos/binary/heat/heat-api-cfn/config-external.sh new file mode 120000 index 000000000..d1d084800 --- /dev/null +++ b/docker/centos/binary/heat/heat-api-cfn/config-external.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api-cfn/config-internal.sh b/docker/centos/binary/heat/heat-api-cfn/config-internal.sh new file mode 120000 index 000000000..280210245 --- /dev/null +++ b/docker/centos/binary/heat/heat-api-cfn/config-internal.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-api-cfn/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile index 407aee601..e7a4214dd 100644 --- a/docker/centos/binary/heat/heat-api/Dockerfile +++ b/docker/centos/binary/heat/heat-api/Dockerfile @@ -11,4 +11,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/heat/heat-api/config-external.sh b/docker/centos/binary/heat/heat-api/config-external.sh new file mode 120000 index 000000000..bfc23ba35 --- /dev/null +++ b/docker/centos/binary/heat/heat-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/config-internal.sh b/docker/centos/binary/heat/heat-api/config-internal.sh new file mode 120000 index 000000000..e13addbc9 --- /dev/null +++ b/docker/centos/binary/heat/heat-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile index b97454e70..d22d1ae3a 100644 --- a/docker/centos/binary/heat/heat-engine/Dockerfile +++ b/docker/centos/binary/heat/heat-engine/Dockerfile @@ -10,4 +10,7 @@ RUN yum -y install \ && yum clean all ADD ./start.sh /start.sh + +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-engine/config-external.sh b/docker/centos/binary/heat/heat-engine/config-external.sh new file mode 120000 index 000000000..a620c9e5b --- /dev/null +++ b/docker/centos/binary/heat/heat-engine/config-external.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/config-internal.sh b/docker/centos/binary/heat/heat-engine/config-internal.sh new file mode 120000 index 000000000..b79835025 --- /dev/null +++ b/docker/centos/binary/heat/heat-engine/config-internal.sh @@ -0,0 +1 @@ +../../../../common/heat/heat-engine/config-internal.sh
\ No newline at end of file |