From 4f3574b99626a470df9534982fd3ae11da7d6ea0 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 18:21:03 +0000 Subject: [PATCH] Remove config-internal for neutron Change-Id: I5db2eee21c3d5780d9be9f6527de3d7fb606a3e8 Partially-implements: blueprint remove-config-internal --- .../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-metadata-agent/check.sh | 1 - .../neutron-metadata-agent/config-internal.sh | 1 - .../neutron/neutron-agents/supervisord.conf | 47 +---- .../binary/neutron/neutron-base/Dockerfile | 2 +- .../neutron/neutron-base/config-neutron.sh | 1 - .../neutron-linuxbridge-agent/Dockerfile | 2 +- .../neutron-linuxbridge-agent/check.sh | 1 - .../config-internal.sh | 1 - .../neutron-openvswitch-agent/Dockerfile | 5 +- .../neutron-openvswitch-agent/check.sh | 1 - .../config-internal.sh | 1 - .../binary/neutron/neutron-server/Dockerfile | 4 +- .../binary/neutron/neutron-server/check.sh | 1 - .../neutron/neutron-server/config-internal.sh | 1 - .../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-metadata-agent/check.sh | 1 - .../neutron-metadata-agent/config-internal.sh | 1 - .../neutron/neutron-agents/supervisord.conf | 47 +---- .../source/neutron/neutron-base/Dockerfile | 2 +- .../neutron/neutron-base/config-neutron.sh | 1 - .../neutron-linuxbridge-agent/Dockerfile | 5 +- .../neutron-linuxbridge-agent/check.sh | 1 - .../config-internal.sh | 1 - .../neutron-openvswitch-agent/Dockerfile | 5 +- .../neutron-openvswitch-agent/check.sh | 1 - .../config-internal.sh | 1 - .../source/neutron/neutron-server/Dockerfile | 4 +- .../source/neutron/neutron-server/check.sh | 1 - .../neutron/neutron-server/config-internal.sh | 1 - .../neutron/neutron-agents/supervisord.conf | 46 +++++ .../neutron/neutron-base/config-neutron.sh | 186 ------------------ .../neutron/neutron-dhcp-agent/check.sh | 13 -- .../neutron-dhcp-agent/config-internal.sh | 92 --------- .../neutron/neutron-dhcp-agent/start.sh | 2 +- .../common/neutron/neutron-l3-agent/check.sh | 13 -- .../neutron-l3-agent/config-internal.sh | 90 --------- .../common/neutron/neutron-l3-agent/start.sh | 2 +- .../neutron-linuxbridge-agent/check.sh | 13 -- .../config-internal.sh | 26 --- .../neutron-linuxbridge-agent/start.sh | 2 +- .../neutron/neutron-metadata-agent/check.sh | 13 -- .../neutron-metadata-agent/config-internal.sh | 74 ------- .../neutron/neutron-metadata-agent/start.sh | 2 +- .../neutron-openvswitch-agent/check.sh | 13 -- .../config-internal.sh | 42 ---- .../neutron-openvswitch-agent/start.sh | 2 +- docker/common/neutron/neutron-server/check.sh | 17 -- .../neutron/neutron-server/config-internal.sh | 103 ---------- docker/common/neutron/neutron-server/start.sh | 2 +- docs/minimal-environment-vars.md | 45 +---- 57 files changed, 72 insertions(+), 875 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 delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-l3-agent/check.sh delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/check.sh delete mode 120000 docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh mode change 100644 => 120000 docker/centos/source/neutron/neutron-agents/supervisord.conf delete mode 120000 docker/centos/source/neutron/neutron-base/config-neutron.sh delete mode 120000 docker/centos/source/neutron/neutron-linuxbridge-agent/check.sh delete mode 120000 docker/centos/source/neutron/neutron-linuxbridge-agent/config-internal.sh delete mode 120000 docker/centos/source/neutron/neutron-openvswitch-agent/check.sh delete mode 120000 docker/centos/source/neutron/neutron-openvswitch-agent/config-internal.sh delete mode 120000 docker/centos/source/neutron/neutron-server/check.sh delete mode 120000 docker/centos/source/neutron/neutron-server/config-internal.sh create mode 100644 docker/common/neutron/neutron-agents/supervisord.conf delete mode 100644 docker/common/neutron/neutron-base/config-neutron.sh delete mode 100755 docker/common/neutron/neutron-dhcp-agent/check.sh delete mode 100755 docker/common/neutron/neutron-dhcp-agent/config-internal.sh delete mode 100755 docker/common/neutron/neutron-l3-agent/check.sh delete mode 100755 docker/common/neutron/neutron-l3-agent/config-internal.sh delete mode 100755 docker/common/neutron/neutron-linuxbridge-agent/check.sh delete mode 100755 docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh delete mode 100755 docker/common/neutron/neutron-metadata-agent/check.sh delete mode 100755 docker/common/neutron/neutron-metadata-agent/config-internal.sh delete mode 100755 docker/common/neutron/neutron-openvswitch-agent/check.sh delete mode 100755 docker/common/neutron/neutron-openvswitch-agent/config-internal.sh delete mode 100755 docker/common/neutron/neutron-server/check.sh delete mode 100755 docker/common/neutron/neutron-server/config-internal.sh 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 8658a69801..0000000000 --- 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 65cd887042..0000000000 --- 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 df50ef3901..0000000000 --- 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 73c2ccb551..0000000000 --- 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 ddbee63083..0000000000 --- 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 23d60c52f8..0000000000 --- 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 2db1af2dc2..0000000000 --- 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 0000000000..a7f24cb777 --- /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 59d6585921..6ceae8ffbb 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 0de5981230..0000000000 --- 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 1a5e03256d..a10b672968 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 469fd5d7fd..0000000000 --- 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 faacbd3ed9..0000000000 --- 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 b18ec9d203..762f6b189f 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 1a664032e6..0000000000 --- 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 1d7c6c6bff..0000000000 --- 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 75f7c066f9..f678357a0d 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 0019366163..0000000000 --- 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 6c3a8a112b..0000000000 --- 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 diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/check.sh deleted file mode 120000 index 8658a69801..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-internal.sh deleted file mode 120000 index 65cd887042..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-l3-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/check.sh deleted file mode 120000 index df50ef3901..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-internal.sh deleted file mode 120000 index 73c2ccb551..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-metadata-agent/check.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/check.sh deleted file mode 120000 index ddbee63083..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-internal.sh deleted file mode 120000 index 23d60c52f8..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf deleted file mode 100644 index 2db1af2dc2..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf new file mode 120000 index 0000000000..a7f24cb777 --- /dev/null +++ b/docker/centos/source/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/source/neutron/neutron-base/Dockerfile b/docker/centos/source/neutron/neutron-base/Dockerfile index 8d9ba1816e..ee57cfedcc 100644 --- a/docker/centos/source/neutron/neutron-base/Dockerfile +++ b/docker/centos/source/neutron/neutron-base/Dockerfile @@ -16,4 +16,4 @@ RUN cd /neutron \ && chown -R neutron: /etc/neutron /var/log/neutron \ && rm -rf /root/.cache -COPY config-neutron.sh config-sudoers.sh /opt/kolla/ +COPY config-sudoers.sh /opt/kolla/ diff --git a/docker/centos/source/neutron/neutron-base/config-neutron.sh b/docker/centos/source/neutron/neutron-base/config-neutron.sh deleted file mode 120000 index 0de5981230..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile index db552af070..ded2b7de04 100644 --- a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile +++ b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile @@ -4,8 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages RUN yum install -y ebtables && 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/source/neutron/neutron-linuxbridge-agent/check.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/check.sh deleted file mode 120000 index 469fd5d7fd..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-internal.sh deleted file mode 120000 index faacbd3ed9..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile index 7bc3e2bb85..4f447853b8 100644 --- a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile +++ b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile @@ -7,8 +7,7 @@ RUN yum install -y \ 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/source/neutron/neutron-openvswitch-agent/check.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/check.sh deleted file mode 120000 index 1a664032e6..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-internal.sh deleted file mode 120000 index 1d7c6c6bff..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-server/Dockerfile b/docker/centos/source/neutron/neutron-server/Dockerfile index 75f7c066f9..f678357a0d 100644 --- a/docker/centos/source/neutron/neutron-server/Dockerfile +++ b/docker/centos/source/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/source/neutron/neutron-server/check.sh b/docker/centos/source/neutron/neutron-server/check.sh deleted file mode 120000 index 0019366163..0000000000 --- a/docker/centos/source/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/source/neutron/neutron-server/config-internal.sh b/docker/centos/source/neutron/neutron-server/config-internal.sh deleted file mode 120000 index 6c3a8a112b..0000000000 --- a/docker/centos/source/neutron/neutron-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/config-internal.sh \ No newline at end of file diff --git a/docker/common/neutron/neutron-agents/supervisord.conf b/docker/common/neutron/neutron-agents/supervisord.conf new file mode 100644 index 0000000000..2db1af2dc2 --- /dev/null +++ b/docker/common/neutron/neutron-agents/supervisord.conf @@ -0,0 +1,46 @@ +[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/common/neutron/neutron-base/config-neutron.sh b/docker/common/neutron/neutron-base/config-neutron.sh deleted file mode 100644 index e36886c0d1..0000000000 --- a/docker/common/neutron/neutron-base/config-neutron.sh +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh - -check_required_vars KEYSTONE_PUBLIC_SERVICE_HOST \ - NEUTRON_API_PASTE_CONFIG \ - NEUTRON_KEYSTONE_PASSWORD \ - RABBITMQ_SERVICE_HOST - -core_cfg=/etc/neutron/neutron.conf -ml2_cfg=/etc/neutron/plugins/ml2/ml2_conf.ini - -# Logging -crudini --set $core_cfg \ - DEFAULT \ - log_dir \ - "${NEUTRON_LOG_DIR}" -crudini --set $core_cfg \ - DEFAULT \ - verbose \ - "${VERBOSE_LOGGING}" -crudini --set $core_cfg \ - DEFAULT \ - debug \ - "${DEBUG_LOGGING}" - -# Paste config -crudini --set $core_cfg \ - DEFAULT \ - api_paste_config \ - "${NEUTRON_API_PASTE_CONFIG}" - -# Rabbit -crudini --set $core_cfg \ - DEFAULT \ - rabbit_host \ - "${RABBIT_HOST}" -crudini --set $core_cfg \ - DEFAULT \ - rabbit_userid \ - "${RABBIT_USER}" -crudini --set $core_cfg \ - DEFAULT \ - rabbit_password \ - "${RABBIT_PASSWORD}" - -# Locking -crudini --set $core_cfg \ - DEFAULT \ - lock_path \ - "/var/lock/neutron" - -# Keystone -crudini --set $core_cfg \ - DEFAULT \ - auth_strategy \ - "keystone" -crudini --set $core_cfg \ - keystone_authtoken \ - auth_uri \ - "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0" -crudini --set $core_cfg \ - keystone_authtoken \ - identity_uri \ - "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}" -crudini --set $core_cfg \ - keystone_authtoken \ - admin_tenant_name \ - "${ADMIN_TENANT_NAME}" -crudini --set $core_cfg \ - keystone_authtoken \ - admin_user \ - "${NEUTRON_KEYSTONE_USER}" -crudini --set $core_cfg \ - keystone_authtoken \ - admin_password \ - "${NEUTRON_KEYSTONE_PASSWORD}" - -# Rootwrap -crudini --set $core_cfg \ - agent \ - root_helper \ - "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" - -# neutron.conf ml2 configuration -crudini --set $core_cfg \ - DEFAULT \ - core_plugin \ - "neutron.plugins.ml2.plugin.Ml2Plugin" -crudini --set $core_cfg \ - DEFAULT \ - service_plugins \ - "neutron.services.l3_router.l3_router_plugin.L3RouterPlugin" -crudini --set $core_cfg \ - DEFAULT \ - allow_overlapping_ips \ - "True" - -# Configure ml2_conf.ini -crudini --set $ml2_cfg \ - ml2 \ - type_drivers \ - "${TYPE_DRIVERS}" -crudini --set $ml2_cfg \ - ml2 \ - tenant_network_types \ - "${TENANT_NETWORK_TYPES}" -crudini --set $ml2_cfg \ - ml2 \ - mechanism_drivers \ - "${MECHANISM_DRIVERS}" - -if [[ ${TYPE_DRIVERS} =~ .*flat.* ]]; then - crudini --set $ml2_cfg \ - ml2_type_flat \ - flat_networks \ - ${NEUTRON_FLAT_NETWORK_NAME} -fi - -if [[ ${TYPE_DRIVERS} =~ .*vxlan.* ]]; then - crudini --set $ml2_cfg \ - ml2_type_vxlan \ - vxlan_group \ - "" - crudini --set $ml2_cfg \ - ml2_type_vxlan \ - vni_ranges \ - "1:1000" - crudini --set $ml2_cfg \ - vxlan \ - enable_vxlan \ - "True" - crudini --set $ml2_cfg \ - vxlan \ - vxlan_group \ - "" - crudini --set $ml2_cfg \ - vxlan \ - l2_population \ - "True" - crudini --set $ml2_cfg \ - agent \ - tunnel_types \ - "vxlan" - crudini --set $ml2_cfg \ - agent \ - vxlan_udp_port \ - "4789" - crudini --set $core_cfg \ - DEFAULT \ - network_device_mtu \ - "1450" -fi - -crudini --set $ml2_cfg \ - l2pop \ - agent_boot_time \ - "180" -crudini --set $ml2_cfg \ - securitygroup \ - enable_security_group \ - "True" -crudini --set $ml2_cfg \ - securitygroup \ - enable_ipset \ - "True" - -if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then - firewall_driver="neutron.agent.linux.iptables_firewall.IptablesFirewallDriver" -elif [[ ${MECHANISM_DRIVERS} == "openvswitch" ]]; then - firewall_driver="neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver" -fi - -crudini --set $ml2_cfg \ - securitygroup \ - firewall_driver \ - "$firewall_driver" - -cat > /openrc <&2 - RES=1 -fi - -exit $RES diff --git a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh b/docker/common/neutron/neutron-dhcp-agent/config-internal.sh deleted file mode 100755 index ad54ff1700..0000000000 --- a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -mkdir -p $(dirname $DNSMASQ_CONFIG_FILE) - -check_required_vars DEBUG_LOGGING \ - DELETE_NAMESPACES \ - DHCP_DRIVER \ - DNSMASQ_CONFIG_FILE \ - MECHANISM_DRIVERS \ - NEUTRON_LOG_DIR \ - USE_NAMESPACES \ - VERBOSE_LOGGING - -cfg=/etc/neutron/dhcp_agent.ini -neutron_conf=/etc/neutron/neutron.conf - -# Workaround bug in dhclient in cirros images which does not correctly -# handle setting checksums of packets when using hardware with checksum -# offloading. See: -# https://www.rdoproject.org/forum/discussion/567/packstack-allinone-grizzly-cirros-image-cannot-get-a-dhcp-address-when-a-centos-image-can/p1 - -/usr/sbin/iptables -A POSTROUTING -t mangle -p udp --dport bootpc \ - -j CHECKSUM --checksum-fill - -if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then - interface_driver="neutron.agent.linux.interface.BridgeInterfaceDriver" -elif [[ ${MECHANISM_DRIVERS} == "openvswitch" ]]; then - interface_driver="neutron.agent.linux.interface.OVSInterfaceDriver" -fi - -# Logging -crudini --set $neutron_conf \ - DEFAULT \ - log_file \ - "${NEUTRON_DHCP_AGENT_LOG_FILE}" - -# Configure dhcp_agent.ini -crudini --set $cfg \ - DEFAULT \ - verbose \ - "${VERBOSE_LOGGING}" -crudini --set $cfg \ - DEFAULT \ - debug \ - "${DEBUG_LOGGING}" -crudini --set $cfg \ - DEFAULT \ - interface_driver \ - "$interface_driver" -crudini --set $cfg \ - DEFAULT \ - dhcp_driver \ - "${DHCP_DRIVER}" -crudini --set $cfg \ - DEFAULT \ - use_namespaces \ - "${USE_NAMESPACES}" -crudini --set $cfg \ - DEFAULT \ - delete_namespaces \ - "${DELETE_NAMESPACES}" -crudini --set $cfg \ - DEFAULT \ - dnsmasq_config_file \ - "${DNSMASQ_CONFIG_FILE}" -crudini --set $cfg \ - DEFAULT \ - root_helper \ - "${ROOT_HELPER}" - -cat > ${DNSMASQ_CONFIG_FILE} <&2 - RES=1 -fi - -exit $RES diff --git a/docker/common/neutron/neutron-l3-agent/config-internal.sh b/docker/common/neutron/neutron-l3-agent/config-internal.sh deleted file mode 100755 index 14e9a091d8..0000000000 --- a/docker/common/neutron/neutron-l3-agent/config-internal.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -check_required_vars DEBUG_LOGGING \ - VERBOSE_LOGGING - - -cfg=/etc/neutron/l3_agent.ini -neutron_conf=/etc/neutron/neutron.conf - -# Logging -crudini --set $neutron_conf \ - DEFAULT \ - log_file \ - "${NEUTRON_L3_AGENT_LOG_FILE}" - -# Configure l3_agent.ini -crudini --set $cfg \ - DEFAULT \ - verbose \ - "${VERBOSE_LOGGING}" -crudini --set $cfg \ - DEFAULT \ - debug \ - "${DEBUG_LOGGING}" -if [[ "${MECHANISM_DRIVERS}" =~ linuxbridge ]] ; then - crudini --set $cfg \ - DEFAULT \ - interface_driver \ - "neutron.agent.linux.interface.BridgeInterfaceDriver" - crudini --set $cfg \ - DEFAULT \ - gateway_external_network_id \ - "" - crudini --set $cfg \ - DEFAULT \ - external_network_bridge \ - "" -elif [[ "${MECHANISM_DRIVERS}" =~ .*openvswitch* ]] ; then - crudini --set $cfg \ - DEFAULT \ - interface_driver \ - "neutron.agent.linux.interface.OVSInterfaceDriver" - crudini --set $cfg \ - DEFAULT \ - gateway_external_network_id \ - "${NEUTRON_FLAT_NETWORK_BRIDGE}" - crudini --set $cfg \ - DEFAULT \ - external_network_bridge \ - "${NEUTRON_FLAT_NETWORK_BRIDGE}" -fi - -crudini --set $cfg \ - DEFAULT \ - use_namespaces \ - "${USE_NAMESPACES}" - -if [ "${USE_NAMESPACES}" == "false" ] ; then - source /openrc - # Create router if it does not exist - /usr/bin/neutron router-list | grep admin-router || /usr/bin/neutron router-create admin-router - # Set router-id - crudini --set $cfg \ - DEFAULT \ - router_id \ - "$(/usr/bin/neutron router-list | awk '/ admin-router / {print $2}')" -elif [ "${USE_NAMESPACES}" == "true" ] ; then - crudini --set $cfg \ - DEFAULT \ - router_delete_namespaces \ - "true" -fi - -# TODO: SamYaple remove this section for thin neutron containers -# The reason we remove existing namespaces is because network namespaces don't -# persist between container restarts because the network proc mountpoint dies -# when the container mount namespace dies. The mountpoint in /run/netns does -# persist however, and that is all we are cleaning up here. - -# Remove any existing qrouter namespaces -ip netns list | grep qrouter | while read -r line ; do - ip netns delete $line -done - -# Start L3 Agent -exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-dir /etc/neutron diff --git a/docker/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh index f181161072..60b2f22846 100755 --- a/docker/common/neutron/neutron-l3-agent/start.sh +++ b/docker/common/neutron/neutron-l3-agent/start.sh @@ -35,7 +35,7 @@ set_configs() { esac } -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/neutron/neutron-linuxbridge-agent/check.sh b/docker/common/neutron/neutron-linuxbridge-agent/check.sh deleted file mode 100755 index 4485fc1ec9..0000000000 --- a/docker/common/neutron/neutron-linuxbridge-agent/check.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -RES=0 - -check=$(/usr/bin/neutron agent-list | awk '/ Linux / {print $10}') -error="ERROR: Neutron Linux Bridge agent is not alive." - -if [[ $check != ":-)" ]]; then - echo $error >&2 - RES=1 -fi - -exit $RES diff --git a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh deleted file mode 100755 index 3005a60471..0000000000 --- a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -check_required_vars NEUTRON_FLAT_NETWORK_INTERFACE \ - NEUTRON_FLAT_NETWORK_NAME \ - PUBLIC_IP - -cfg=/etc/neutron/plugins/ml2/ml2_conf.ini - -# Configure ml2_conf.ini -if [[ ${TYPE_DRIVERS} =~ vxlan ]]; then - crudini --set $cfg \ - vxlan \ - local_ip \ - "${PUBLIC_IP}" -fi - -crudini --set $cfg \ - linux_bridge \ - physical_interface_mappings \ - "${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}" - -exec /usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron diff --git a/docker/common/neutron/neutron-linuxbridge-agent/start.sh b/docker/common/neutron/neutron-linuxbridge-agent/start.sh index aea4aea890..ab47f2dfb1 100755 --- a/docker/common/neutron/neutron-linuxbridge-agent/start.sh +++ b/docker/common/neutron/neutron-linuxbridge-agent/start.sh @@ -8,7 +8,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins source /opt/kolla/kolla-common.sh source /opt/kolla/config-sudoers.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/neutron/neutron-metadata-agent/check.sh b/docker/common/neutron/neutron-metadata-agent/check.sh deleted file mode 100755 index fd1c6812b4..0000000000 --- a/docker/common/neutron/neutron-metadata-agent/check.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -RES=0 - -check=$(/usr/bin/neutron agent-list | awk '/ Metadata / {print $9}') -error="ERROR: Neutron Metadata Agent is not alive." - -if [[ $check != ":-)" ]]; then - echo $error >&2 - RES=1 -fi - -exit $RES diff --git a/docker/common/neutron/neutron-metadata-agent/config-internal.sh b/docker/common/neutron/neutron-metadata-agent/config-internal.sh deleted file mode 100755 index b0860006fb..0000000000 --- a/docker/common/neutron/neutron-metadata-agent/config-internal.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -check_required_vars ADMIN_TENANT_NAME \ - DEBUG_LOGGING \ - KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_PUBLIC_SERVICE_HOST \ - NEUTRON_KEYSTONE_PASSWORD \ - NEUTRON_KEYSTONE_USER \ - NEUTRON_SHARED_SECRET \ - NOVA_METADATA_API_SERVICE_HOST \ - NOVA_METADATA_API_SERVICE_PORT \ - VERBOSE_LOGGING - -cfg=/etc/neutron/metadata_agent.ini -neutron_conf=/etc/neutron/neutron.conf - -# Logging -crudini --set $neutron_conf \ - DEFAULT \ - log_file \ - "${NEUTRON_METADATA_AGENT_LOG_FILE}" - -# Configure metadata_agent.ini -crudini --set $cfg \ - DEFAULT \ - verbose \ - "${VERBOSE_LOGGING}" -crudini --set $cfg \ - DEFAULT \ - debug \ - "${DEBUG_LOGGING}" -crudini --set $cfg \ - DEFAULT \ - auth_region \ - "${KEYSTONE_REGION}" -crudini --set $cfg \ - DEFAULT \ - endpoint_type \ - "${ENDPOINT_TYPE}" -crudini --set $cfg \ - DEFAULT \ - auth_url \ - "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0" -crudini --set $cfg \ - DEFAULT \ - admin_tenant_name \ - "${ADMIN_TENANT_NAME}" -crudini --set $cfg \ - DEFAULT \ - admin_user \ - "${NEUTRON_KEYSTONE_USER}" -crudini --set $cfg \ - DEFAULT \ - admin_password \ - "${NEUTRON_KEYSTONE_PASSWORD}" -crudini --set $cfg \ - DEFAULT \ - nova_metadata_ip \ - "${NOVA_METADATA_API_SERVICE_HOST}" -crudini --set $cfg \ - DEFAULT \ - nova_metadata_port \ - "${NOVA_METADATA_API_SERVICE_PORT}" -crudini --set $cfg \ - DEFAULT \ - metadata_proxy_shared_secret \ - "${NEUTRON_SHARED_SECRET}" - -# Start Metadata Agent -exec /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron diff --git a/docker/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh index ab4f4a590c..5b222fa4ce 100755 --- a/docker/common/neutron/neutron-metadata-agent/start.sh +++ b/docker/common/neutron/neutron-metadata-agent/start.sh @@ -35,7 +35,7 @@ set_configs() { esac } -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/neutron/neutron-openvswitch-agent/check.sh b/docker/common/neutron/neutron-openvswitch-agent/check.sh deleted file mode 100755 index 087bf4fdbf..0000000000 --- a/docker/common/neutron/neutron-openvswitch-agent/check.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -RES=0 - -check=$(/usr/bin/neutron agent-list | awk '/ vSwitch / {print $10}') -error="ERROR: Neutron OpenvSwitch agent is not alive." - -if [[ $check != ":-)" ]]; then - echo $error >&2 - RES=1 -fi - -exit $RES diff --git a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh deleted file mode 100755 index 14d5aeb90e..0000000000 --- a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -check_required_vars NEUTRON_FLAT_NETWORK_INTERFACE \ - NEUTRON_FLAT_NETWORK_NAME \ - PUBLIC_IP - -if ! ovs-vsctl show |grep ${NEUTRON_FLAT_NETWORK_INTERFACE} > /dev/null; then - ovs-vsctl add-br ${NEUTRON_FLAT_NETWORK_INTERFACE} -fi - -cfg=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini - -# Configure ml2_conf.ini -if [[ ${TYPE_DRIVERS} =~ vxlan ]]; then - crudini --set $cfg \ - vxlan \ - local_ip \ - "${PUBLIC_IP}" -fi - -crudini --set $cfg \ - ovs \ - bridge_mappings \ - "${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}" - -crudini --set $cfg \ - ovs \ - tenant_network_type \ - "${TENANT_NETWORK_TYPES}" - -if [[ ${TENANT_NETWORK_TYPES} =~ "vlan" ]];then - crudini --set $cfg \ - ovs \ - network_vlan_ranges \ - "${NEUTRON_VLAN_NETWORK_NAME}:${NEUTRON_NETWORK_VLAN_RANGES}" -fi - -exec /usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file $cfg diff --git a/docker/common/neutron/neutron-openvswitch-agent/start.sh b/docker/common/neutron/neutron-openvswitch-agent/start.sh index 601fcaf879..6d62ff65d5 100755 --- a/docker/common/neutron/neutron-openvswitch-agent/start.sh +++ b/docker/common/neutron/neutron-openvswitch-agent/start.sh @@ -8,7 +8,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins source /opt/kolla/kolla-common.sh source /opt/kolla/config-sudoers.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/neutron/neutron-server/check.sh b/docker/common/neutron/neutron-server/check.sh deleted file mode 100755 index 4e9aa623c6..0000000000 --- a/docker/common/neutron/neutron-server/check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -RES=0 - -. /openrc -if ! keystone token-get > /dev/null; then - echo "ERROR: keystone token-get failed" >&2 - RES=1 -else - if ! neutron ext-list > /dev/null; then - echo "ERROR: neutron ext-list failed" >&2 - RES=1 - fi -fi - -exit $RES - diff --git a/docker/common/neutron/neutron-server/config-internal.sh b/docker/common/neutron/neutron-server/config-internal.sh deleted file mode 100755 index 961a0aaf74..0000000000 --- a/docker/common/neutron/neutron-server/config-internal.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-neutron.sh - -check_required_vars ADMIN_TENANT_NAME \ - KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_TOKEN \ - KEYSTONE_AUTH_PROTOCOL \ - NEUTRON_DB_NAME \ - NEUTRON_DB_PASSWORD \ - NEUTRON_DB_PASSWORD \ - NEUTRON_DB_USER \ - NEUTRON_KEYSTONE_PASSWORD \ - NEUTRON_KEYSTONE_USER \ - NEUTRON_SERVER_SERVICE_HOST \ - NOVA_API_SERVICE_HOST \ - NOVA_KEYSTONE_PASSWORD \ - NOVA_KEYSTONE_USER \ - PUBLIC_IP -fail_unless_os_service_running keystone -fail_unless_db - -mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <