From 0de08336754cbff67d320fcf5d68ad97243f96ec Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Thu, 2 Jul 2015 19:49:11 +0200 Subject: Add config-internal/config-external to Nova-compute containers Partially Implements: Blueprint standard-start Change-Id: Ia219015f18d788d0c01c0bffee6b475bb07291a9 --- docker/centos/binary/nova-compute/nova-compute/Dockerfile | 2 ++ docker/centos/binary/nova-compute/nova-compute/config-external.sh | 1 + docker/centos/binary/nova-compute/nova-compute/config-internal.sh | 1 + docker/centos/binary/nova-compute/nova-libvirt/Dockerfile | 2 ++ docker/centos/binary/nova-compute/nova-libvirt/config-external.sh | 1 + docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh | 1 + docker/centos/binary/nova-compute/nova-network/Dockerfile | 2 ++ docker/centos/binary/nova-compute/nova-network/config-external.sh | 1 + docker/centos/binary/nova-compute/nova-network/config-internal.sh | 1 + 9 files changed, 12 insertions(+) create mode 120000 docker/centos/binary/nova-compute/nova-compute/config-external.sh create mode 120000 docker/centos/binary/nova-compute/nova-compute/config-internal.sh create mode 120000 docker/centos/binary/nova-compute/nova-libvirt/config-external.sh create mode 120000 docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh create mode 120000 docker/centos/binary/nova-compute/nova-network/config-external.sh create mode 120000 docker/centos/binary/nova-compute/nova-network/config-internal.sh (limited to 'docker/centos/binary/nova-compute') diff --git a/docker/centos/binary/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova-compute/nova-compute/Dockerfile index d23b86e5f..4e307a613 100644 --- a/docker/centos/binary/nova-compute/nova-compute/Dockerfile +++ b/docker/centos/binary/nova-compute/nova-compute/Dockerfile @@ -8,6 +8,8 @@ ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh ADD ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + VOLUME [ "/sys/fs/cgroup" ] CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-compute/config-external.sh b/docker/centos/binary/nova-compute/nova-compute/config-external.sh new file mode 120000 index 000000000..46de4bf33 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-compute/config-external.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-compute/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/config-internal.sh b/docker/centos/binary/nova-compute/nova-compute/config-internal.sh new file mode 120000 index 000000000..58337d966 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-compute/config-internal.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-compute/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile index 980940615..1dcf9156b 100644 --- a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile +++ b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile @@ -13,4 +13,6 @@ VOLUME [ "/sys/fs/cgroup" ] ADD ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh new file mode 120000 index 000000000..22275236b --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-libvirt/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh new file mode 120000 index 000000000..c20242db7 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-libvirt/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova-compute/nova-network/Dockerfile index 2434dbdf0..061ab1f9e 100644 --- a/docker/centos/binary/nova-compute/nova-network/Dockerfile +++ b/docker/centos/binary/nova-compute/nova-network/Dockerfile @@ -7,4 +7,6 @@ RUN yum -y install openstack-nova-network \ ADD config-nova-network.sh /opt/kolla/config-nova-network.sh ADD ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-network/config-external.sh b/docker/centos/binary/nova-compute/nova-network/config-external.sh new file mode 120000 index 000000000..1257cd898 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-network/config-external.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-network/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/config-internal.sh b/docker/centos/binary/nova-compute/nova-network/config-internal.sh new file mode 120000 index 000000000..3b64fcabc --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-network/config-internal.sh @@ -0,0 +1 @@ +../../../../common/nova-compute/nova-network/config-internal.sh \ No newline at end of file -- cgit v1.2.3