diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 14:22:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 14:22:33 +0000 |
| commit | fb7ced9cea5243e02a1e072f4ea4e09ed73cfc7e (patch) | |
| tree | a93b2dcada73644067143287292a943ff9646485 /docker/centos/binary | |
| parent | 4c4181d54a5fe5491db8e3f4f29a615005d23c64 (diff) | |
| parent | a5a469c102c091255ffacd284be123da9a98a539 (diff) | |
| download | kolla-fb7ced9cea5243e02a1e072f4ea4e09ed73cfc7e.tar.gz kolla-fb7ced9cea5243e02a1e072f4ea4e09ed73cfc7e.zip | |
Merge "Add config-internal/config-external for cinder"
Diffstat (limited to 'docker/centos/binary')
12 files changed, 12 insertions, 0 deletions
diff --git a/docker/centos/binary/cinder-app/cinder-api/Dockerfile b/docker/centos/binary/cinder-app/cinder-api/Dockerfile index 3d3e3ae8f..c96caaecc 100644 --- a/docker/centos/binary/cinder-app/cinder-api/Dockerfile +++ b/docker/centos/binary/cinder-app/cinder-api/Dockerfile @@ -2,6 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y python-keystone && yum clean all +COPY config-internal.sh config-external.sh /opt/kolla/ COPY ./start.sh ./check.sh / CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder-app/cinder-api/config-external.sh b/docker/centos/binary/cinder-app/cinder-api/config-external.sh new file mode 120000 index 000000000..5b577f290 --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-api/config-internal.sh b/docker/centos/binary/cinder-app/cinder-api/config-internal.sh new file mode 120000 index 000000000..d929c89b2 --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-backup/Dockerfile b/docker/centos/binary/cinder-app/cinder-backup/Dockerfile index fb44155b3..43994f123 100644 --- a/docker/centos/binary/cinder-app/cinder-backup/Dockerfile +++ b/docker/centos/binary/cinder-app/cinder-backup/Dockerfile @@ -2,5 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder-app/cinder-backup/config-external.sh b/docker/centos/binary/cinder-app/cinder-backup/config-external.sh new file mode 120000 index 000000000..c80c21a20 --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-backup/config-external.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-backup/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-backup/config-internal.sh b/docker/centos/binary/cinder-app/cinder-backup/config-internal.sh new file mode 120000 index 000000000..5f135c63b --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-backup/config-internal.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-backup/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile index 344dc142f..1014e3dce 100644 --- a/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile +++ b/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile @@ -2,5 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh new file mode 120000 index 000000000..976249002 --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-scheduler/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/config-internal.sh b/docker/centos/binary/cinder-app/cinder-scheduler/config-internal.sh new file mode 120000 index 000000000..f3792cd9c --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-scheduler/config-internal.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-scheduler/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-volume/Dockerfile b/docker/centos/binary/cinder-app/cinder-volume/Dockerfile index d82fed03c..0daf6d29e 100644 --- a/docker/centos/binary/cinder-app/cinder-volume/Dockerfile +++ b/docker/centos/binary/cinder-app/cinder-volume/Dockerfile @@ -11,6 +11,7 @@ RUN yum install -y lvm2 scsi-target-utils && yum clean all # Add start scripts COPY start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ COPY volume-group-create.sh /opt/kolla/volume-group-create.sh # Start supervisor diff --git a/docker/centos/binary/cinder-app/cinder-volume/config-external.sh b/docker/centos/binary/cinder-app/cinder-volume/config-external.sh new file mode 120000 index 000000000..1f6476f2e --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-volume/config-external.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-volume/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder-app/cinder-volume/config-internal.sh b/docker/centos/binary/cinder-app/cinder-volume/config-internal.sh new file mode 120000 index 000000000..4739be2fc --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-volume/config-internal.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-volume/config-internal.sh
\ No newline at end of file |