diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-05 09:04:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-05 09:04:46 +0000 |
| commit | 2fe35c25bf31873c253e495eee04fd15154f43d2 (patch) | |
| tree | 81c9b7ddf6d1ea9615e835efc3f4af044c39e7b2 /docker/centos/binary | |
| parent | cb7115241b630e3132c1872c0dc21fc0cbbb20b4 (diff) | |
| parent | 85ea344d4ba3da78d0ca8c707c576fb54d4b1fd7 (diff) | |
| download | kolla-2fe35c25bf31873c253e495eee04fd15154f43d2.tar.gz kolla-2fe35c25bf31873c253e495eee04fd15154f43d2.zip | |
Merge "Add config-internal/config-external to Neutron containers"
Diffstat (limited to 'docker/centos/binary')
15 files changed, 17 insertions, 0 deletions
diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh new file mode 120000 index 000000000..680eee875 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-dhcp-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh new file mode 120000 index 000000000..65cd88704 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-dhcp-agent/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh new file mode 120000 index 000000000..f4530afd9 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-l3-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-internal.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-internal.sh new file mode 120000 index 000000000..73c2ccb55 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-internal.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-l3-agent/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh new file mode 120000 index 000000000..a5c3ac24a --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-metadata-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh new file mode 120000 index 000000000..23d60c52f --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh @@ -0,0 +1 @@ +../../../../../common/neutron/neutron-metadata-agent/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile index 702e16b42..1ad5d82f3 100644 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile +++ b/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile @@ -7,4 +7,6 @@ RUN yum install -y openstack-neutron-linuxbridge && \ COPY check.sh start.sh / +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh new file mode 120000 index 000000000..6bd77d67d --- /dev/null +++ b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-internal.sh new file mode 120000 index 000000000..faacbd3ed --- /dev/null +++ b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-internal.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-linuxbridge-agent/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile index 551d81a53..b18ec9d20 100644 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile +++ b/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile @@ -8,4 +8,6 @@ RUN yum install -y openstack-neutron-openvswitch \ COPY check.sh start.sh / +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh new file mode 120000 index 000000000..14354b71a --- /dev/null +++ b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-openvswitch-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-internal.sh new file mode 120000 index 000000000..1d7c6c6bf --- /dev/null +++ b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-internal.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-openvswitch-agent/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-server/Dockerfile b/docker/centos/binary/neutron/neutron-server/Dockerfile index 0bfd3cf4b..75f7c066f 100644 --- a/docker/centos/binary/neutron/neutron-server/Dockerfile +++ b/docker/centos/binary/neutron/neutron-server/Dockerfile @@ -6,5 +6,6 @@ RUN yum install -y which && \ yum clean all COPY check.sh start.sh / +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-server/config-external.sh b/docker/centos/binary/neutron/neutron-server/config-external.sh new file mode 120000 index 000000000..b8d7792ce --- /dev/null +++ b/docker/centos/binary/neutron/neutron-server/config-external.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-server/config-internal.sh b/docker/centos/binary/neutron/neutron-server/config-internal.sh new file mode 120000 index 000000000..6c3a8a112 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-server/config-internal.sh @@ -0,0 +1 @@ +../../../../common/neutron/neutron-server/config-internal.sh
\ No newline at end of file |