From a5a469c102c091255ffacd284be123da9a98a539 Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Fri, 3 Jul 2015 05:26:39 +0000 Subject: Add config-internal/config-external for cinder Partially Implements: Blueprint standard-start Change-Id: I9fa5cc8f6f57b46f8af165778388435b91c28447 --- docker/centos/binary/cinder-app/cinder-api/Dockerfile | 1 + docker/centos/binary/cinder-app/cinder-api/config-external.sh | 1 + docker/centos/binary/cinder-app/cinder-api/config-internal.sh | 1 + docker/centos/binary/cinder-app/cinder-backup/Dockerfile | 1 + docker/centos/binary/cinder-app/cinder-backup/config-external.sh | 1 + docker/centos/binary/cinder-app/cinder-backup/config-internal.sh | 1 + docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile | 1 + docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh | 1 + docker/centos/binary/cinder-app/cinder-scheduler/config-internal.sh | 1 + docker/centos/binary/cinder-app/cinder-volume/Dockerfile | 1 + docker/centos/binary/cinder-app/cinder-volume/config-external.sh | 1 + docker/centos/binary/cinder-app/cinder-volume/config-internal.sh | 1 + 12 files changed, 12 insertions(+) create mode 120000 docker/centos/binary/cinder-app/cinder-api/config-external.sh create mode 120000 docker/centos/binary/cinder-app/cinder-api/config-internal.sh create mode 120000 docker/centos/binary/cinder-app/cinder-backup/config-external.sh create mode 120000 docker/centos/binary/cinder-app/cinder-backup/config-internal.sh create mode 120000 docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh create mode 120000 docker/centos/binary/cinder-app/cinder-scheduler/config-internal.sh create mode 120000 docker/centos/binary/cinder-app/cinder-volume/config-external.sh create mode 120000 docker/centos/binary/cinder-app/cinder-volume/config-internal.sh (limited to 'docker/centos/binary/cinder-app') 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 -- cgit v1.2.3