From 4f3574b99626a470df9534982fd3ae11da7d6ea0 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 18:21:03 +0000 Subject: Remove config-internal for neutron Change-Id: I5db2eee21c3d5780d9be9f6527de3d7fb606a3e8 Partially-implements: blueprint remove-config-internal --- .../neutron-agents/neutron-dhcp-agent/check.sh | 1 - .../neutron-dhcp-agent/config-internal.sh | 1 - .../neutron-agents/neutron-l3-agent/check.sh | 1 - .../neutron-l3-agent/config-internal.sh | 1 - .../neutron-agents/neutron-metadata-agent/check.sh | 1 - .../neutron-metadata-agent/config-internal.sh | 1 - .../binary/neutron/neutron-agents/supervisord.conf | 47 +--------------------- .../centos/binary/neutron/neutron-base/Dockerfile | 2 +- .../binary/neutron/neutron-base/config-neutron.sh | 1 - .../neutron/neutron-linuxbridge-agent/Dockerfile | 2 +- .../neutron/neutron-linuxbridge-agent/check.sh | 1 - .../neutron-linuxbridge-agent/config-internal.sh | 1 - .../neutron/neutron-openvswitch-agent/Dockerfile | 5 +-- .../neutron/neutron-openvswitch-agent/check.sh | 1 - .../neutron-openvswitch-agent/config-internal.sh | 1 - .../binary/neutron/neutron-server/Dockerfile | 4 +- .../centos/binary/neutron/neutron-server/check.sh | 1 - .../neutron/neutron-server/config-internal.sh | 1 - 18 files changed, 7 insertions(+), 66 deletions(-) delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-internal.sh delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh mode change 100644 => 120000 docker/centos/binary/neutron/neutron-agents/supervisord.conf delete mode 120000 docker/centos/binary/neutron/neutron-base/config-neutron.sh delete mode 120000 docker/centos/binary/neutron/neutron-linuxbridge-agent/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-linuxbridge-agent/config-internal.sh delete mode 120000 docker/centos/binary/neutron/neutron-openvswitch-agent/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-openvswitch-agent/config-internal.sh delete mode 120000 docker/centos/binary/neutron/neutron-server/check.sh delete mode 120000 docker/centos/binary/neutron/neutron-server/config-internal.sh (limited to 'docker/centos/binary') diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/check.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/check.sh deleted file mode 120000 index 8658a6980..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-dhcp-agent/check.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 deleted file mode 120000 index 65cd88704..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../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/check.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/check.sh deleted file mode 120000 index df50ef390..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/check.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 deleted file mode 120000 index 73c2ccb55..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../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/check.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/check.sh deleted file mode 120000 index ddbee6308..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/check.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 deleted file mode 120000 index 23d60c52f..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf deleted file mode 100644 index 2db1af2dc..000000000 --- a/docker/centos/binary/neutron/neutron-agents/supervisord.conf +++ /dev/null @@ -1,46 +0,0 @@ -[unix_http_server] -file = /var/run/supervisor.sock - -[inet_http_server] -port = 127.0.0.1:9001 - -[supervisord] -nodaemon=true -logfile = /var/log/supervisor/supervisord.log -logfile_maxbytes = 200KB -logfile_backups = 1 -pidfile = /var/run/supervisord.pid -childlogdir = /var/log/supervisor - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///var/run/supervisor.sock - -[program:neutron-dhcp-agent] -command=/opt/kolla/neutron-dhcp-agent/start.sh -priority=40 -startsec=10 -stderr_events_enabled=true -stdout_events_enabled=true - -[program:neutron-metadata-agent] -command=/opt/kolla/neutron-metadata-agent/start.sh -priority=40 -startsec=10 -stderr_events_enabled=true -stdout_events_enabled=true - -[program:neutron-l3-agent] -command=/opt/kolla/neutron-l3-agent/start.sh -priority=40 -startsec=10 -stderr_events_enabled=true -stdout_events_enabled=true - -[eventlistener:stdout] -command = supervisor_stdout -buffer_size = 100 -events = PROCESS_LOG -result_handler = supervisor_stdout:event_handler diff --git a/docker/centos/binary/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf new file mode 120000 index 000000000..a7f24cb77 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/supervisord.conf @@ -0,0 +1 @@ +../../../../common/neutron/neutron-agents/supervisord.conf \ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile index 59d658592..6ceae8ffb 100644 --- a/docker/centos/binary/neutron/neutron-base/Dockerfile +++ b/docker/centos/binary/neutron/neutron-base/Dockerfile @@ -7,4 +7,4 @@ RUN yum -y install openstack-neutron \ openvswitch \ && yum clean all -COPY config-neutron.sh config-sudoers.sh /opt/kolla/ +COPY config-sudoers.sh /opt/kolla/ diff --git a/docker/centos/binary/neutron/neutron-base/config-neutron.sh b/docker/centos/binary/neutron/neutron-base/config-neutron.sh deleted file mode 120000 index 0de598123..000000000 --- a/docker/centos/binary/neutron/neutron-base/config-neutron.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-base/config-neutron.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 1a5e03256..a10b67296 100644 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile +++ b/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile @@ -7,6 +7,6 @@ RUN yum install -y ebtables openstack-neutron-linuxbridge && \ COPY check.sh start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ + COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/check.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/check.sh deleted file mode 120000 index 469fd5d7f..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-linuxbridge-agent/check.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 deleted file mode 120000 index faacbd3ed..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 b18ec9d20..762f6b189 100644 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile +++ b/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile @@ -6,8 +6,7 @@ RUN yum install -y openstack-neutron-openvswitch \ openvswitch \ && yum clean all -COPY check.sh start.sh / - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/check.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/check.sh deleted file mode 120000 index 1a664032e..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-openvswitch-agent/check.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 deleted file mode 120000 index 1d7c6c6bf..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 75f7c066f..f678357a0 100644 --- a/docker/centos/binary/neutron/neutron-server/Dockerfile +++ b/docker/centos/binary/neutron/neutron-server/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y which && \ yum clean all -COPY check.sh start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-server/check.sh b/docker/centos/binary/neutron/neutron-server/check.sh deleted file mode 120000 index 001936616..000000000 --- a/docker/centos/binary/neutron/neutron-server/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/check.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 deleted file mode 120000 index 6c3a8a112..000000000 --- a/docker/centos/binary/neutron/neutron-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/config-internal.sh \ No newline at end of file -- cgit v1.2.3