From bbf704cbfd84409b9feac52703ee3a4da21177ff Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 15 Mar 2018 15:34:28 +0000 Subject: [PATCH] Further tidy for removed features Deploy from source templates. zeromq section templates. Change-Id: I336ae1ceaaa67f1d78acda14b0a2e0d0f603c777 --- .../cron.d/neutron-dhcp-agent-netns-cleanup | 4 --- .../git/cron.d/neutron-l3-agent-netns-cleanup | 4 --- .../cron.d/neutron-lbaas-agent-netns-cleanup | 4 --- .../git/neutron-dhcp-agent.init.in.template | 24 ------------------ .../git/neutron-l3-agent.init.in.template | 25 ------------------- .../git/neutron-lbaas-agent.init.in.template | 24 ------------------ .../neutron-lbaasv2-agent.init.in.template | 24 ------------------ ...neutron-linuxbridge-agent.init.in.template | 24 ------------------ .../git/neutron-linuxbridge-agent.service.in | 19 -------------- ...utron-linuxbridge-cleanup.init.in.template | 19 -------------- .../neutron-linuxbridge-cleanup.service.in | 17 ------------- .../neutron-macvtap-agent.init.in.template | 24 ------------------ .../neutron-metadata-agent.init.in.template | 24 ------------------ .../neutron-metering-agent.init.in.template | 24 ------------------ ...neutron-openvswitch-agent.init.in.template | 20 --------------- .../git/neutron-openvswitch-agent.service.in | 19 -------------- .../git/neutron-ovs-cleanup.init.in.template | 19 -------------- templates/git/neutron-ovs-cleanup.service.in | 17 ------------- ...-plugin-openvswitch-agent.init.in.template | 20 --------------- ...eutron-plugin-openvswitch-agent.service.in | 19 -------------- templates/git/neutron-server.init.in.template | 19 -------------- .../git/neutron-sriov-agent.init.in.template | 22 ---------------- .../git/neutron-vpn-agent.init.in.template | 24 ------------------ templates/git/neutron_sudoers | 4 --- .../git/nova-api-metadata.init.in.template | 21 ---------------- templates/git/nova_sudoers | 4 --- templates/git/upstart/neutron-agent.upstart | 25 ------------------- .../git/upstart/neutron-ovs-cleanup.upstart | 13 ---------- templates/git/upstart/neutron-server.upstart | 22 ---------------- templates/kilo/neutron.conf | 2 -- templates/kilo/nova.conf | 2 -- templates/mitaka/neutron.conf | 2 -- templates/mitaka/nova.conf | 2 -- 33 files changed, 536 deletions(-) delete mode 100644 templates/git/cron.d/neutron-dhcp-agent-netns-cleanup delete mode 100644 templates/git/cron.d/neutron-l3-agent-netns-cleanup delete mode 100644 templates/git/cron.d/neutron-lbaas-agent-netns-cleanup delete mode 100644 templates/git/neutron-dhcp-agent.init.in.template delete mode 100644 templates/git/neutron-l3-agent.init.in.template delete mode 100644 templates/git/neutron-lbaas-agent.init.in.template delete mode 100644 templates/git/neutron-lbaasv2-agent.init.in.template delete mode 100644 templates/git/neutron-linuxbridge-agent.init.in.template delete mode 100644 templates/git/neutron-linuxbridge-agent.service.in delete mode 100644 templates/git/neutron-linuxbridge-cleanup.init.in.template delete mode 100644 templates/git/neutron-linuxbridge-cleanup.service.in delete mode 100644 templates/git/neutron-macvtap-agent.init.in.template delete mode 100644 templates/git/neutron-metadata-agent.init.in.template delete mode 100644 templates/git/neutron-metering-agent.init.in.template delete mode 100644 templates/git/neutron-openvswitch-agent.init.in.template delete mode 100644 templates/git/neutron-openvswitch-agent.service.in delete mode 100644 templates/git/neutron-ovs-cleanup.init.in.template delete mode 100644 templates/git/neutron-ovs-cleanup.service.in delete mode 100644 templates/git/neutron-plugin-openvswitch-agent.init.in.template delete mode 100644 templates/git/neutron-plugin-openvswitch-agent.service.in delete mode 100644 templates/git/neutron-server.init.in.template delete mode 100644 templates/git/neutron-sriov-agent.init.in.template delete mode 100644 templates/git/neutron-vpn-agent.init.in.template delete mode 100644 templates/git/neutron_sudoers delete mode 100644 templates/git/nova-api-metadata.init.in.template delete mode 100644 templates/git/nova_sudoers delete mode 100644 templates/git/upstart/neutron-agent.upstart delete mode 100644 templates/git/upstart/neutron-ovs-cleanup.upstart delete mode 100644 templates/git/upstart/neutron-server.upstart diff --git a/templates/git/cron.d/neutron-dhcp-agent-netns-cleanup b/templates/git/cron.d/neutron-dhcp-agent-netns-cleanup deleted file mode 100644 index f42d71e2..00000000 --- a/templates/git/cron.d/neutron-dhcp-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Neutron's network namespaces on behalf of the Neutron -# DHCP agent. -30 * * * * neutron if [ -x /usr/local/bin/neutron-netns-cleanup ] ; then /usr/local/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi diff --git a/templates/git/cron.d/neutron-l3-agent-netns-cleanup b/templates/git/cron.d/neutron-l3-agent-netns-cleanup deleted file mode 100644 index f13bfb11..00000000 --- a/templates/git/cron.d/neutron-l3-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Neutron's network namespaces on behalf of the Neutron -# L3 agent. -0 * * * * neutron if [ -x /usr/local/bin/neutron-netns-cleanup ] ; then /usr/local/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi diff --git a/templates/git/cron.d/neutron-lbaas-agent-netns-cleanup b/templates/git/cron.d/neutron-lbaas-agent-netns-cleanup deleted file mode 100644 index 6ffaa7cf..00000000 --- a/templates/git/cron.d/neutron-lbaas-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Neutron's network namespaces on behalf of the Neutron -# L3 agent. -0 * * * * neutron if [ -x /usr/local/bin/neutron-netns-cleanup ] ; then /usr/local/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi diff --git a/templates/git/neutron-dhcp-agent.init.in.template b/templates/git/neutron-dhcp-agent.init.in.template deleted file mode 100644 index 6331f126..00000000 --- a/templates/git/neutron-dhcp-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-dhcp-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone neutron-ovs-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron DHCP agent -# Description: Provide DHCP agent for neutron -### END INIT INFO - -# Author: Mehdi Abaakouk - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron DHCP agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-dhcp-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/dhcp_agent.ini" diff --git a/templates/git/neutron-l3-agent.init.in.template b/templates/git/neutron-l3-agent.init.in.template deleted file mode 100644 index 33d0b1c6..00000000 --- a/templates/git/neutron-l3-agent.init.in.template +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-l3-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone openvswitch-switch neutron-ovs-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron L3 agent -# Description: Provide L3 agent for neutron -### END INIT INFO - -# Authors: Mehdi Abaakouk -# Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron L3 agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-l3-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini" diff --git a/templates/git/neutron-lbaas-agent.init.in.template b/templates/git/neutron-lbaas-agent.init.in.template deleted file mode 100644 index 2a047e2f..00000000 --- a/templates/git/neutron-lbaas-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-lbaas-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron LBaaS agent -# Description: Provide LBaaS agent for neutron -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron LBaaS agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-lbaas-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be happened -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini" diff --git a/templates/git/neutron-lbaasv2-agent.init.in.template b/templates/git/neutron-lbaasv2-agent.init.in.template deleted file mode 100644 index 00f387a1..00000000 --- a/templates/git/neutron-lbaasv2-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-lbaasv2-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron LBaaS v2 agent -# Description: Provide LBaaS v2 agent for neutron -### END INIT INFO - -# Author: Corey Bryant - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron LBaaSv2 agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-lbaasv2-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be happened -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini" diff --git a/templates/git/neutron-linuxbridge-agent.init.in.template b/templates/git/neutron-linuxbridge-agent.init.in.template deleted file mode 100644 index 400c3156..00000000 --- a/templates/git/neutron-linuxbridge-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-linuxbridge-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone neutron-linuxbridge-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron LinuxBridge Agent -# Description: Agent to use within neutron linuxbridge client -### END INIT INFO - -# Author: Ghe Rivero - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Openstack Neutron LinuxBridge Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-linuxbridge-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/linuxbridge_agent.ini" diff --git a/templates/git/neutron-linuxbridge-agent.service.in b/templates/git/neutron-linuxbridge-agent.service.in deleted file mode 100644 index 2b865f01..00000000 --- a/templates/git/neutron-linuxbridge-agent.service.in +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Openstack Neutron Linux Bridge Agent -After=mysql.service postgresql.service rabbitmq-server.service keystone.service -Requires=neutron-linuxbridge-cleanup.service - -[Service] -User=neutron -Group=neutron -WorkingDirectory=/var/lib/neutron -PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStart=/etc/init.d/neutron-linuxbridge-agent systemd-start -Restart=on-failure -LimitNOFILE=65535 - -[Install] -WantedBy=multi-user.target - diff --git a/templates/git/neutron-linuxbridge-cleanup.init.in.template b/templates/git/neutron-linuxbridge-cleanup.init.in.template deleted file mode 100644 index b9b99ca9..00000000 --- a/templates/git/neutron-linuxbridge-cleanup.init.in.template +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-linuxbridge-cleanup -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Linux Bridge Cleanup -# Description: Linux Bridge Cleanup for OpenStack Neutron -### END INIT INFO - -# Authors: Corey Bryant - -DESC="OpenStack Neutron Linux bridge cleanup" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-linuxbridge-cleanup -DAEMON={{ daemon_path }} diff --git a/templates/git/neutron-linuxbridge-cleanup.service.in b/templates/git/neutron-linuxbridge-cleanup.service.in deleted file mode 100644 index 0ab11424..00000000 --- a/templates/git/neutron-linuxbridge-cleanup.service.in +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=OpenStack Neutron Linux bridge cleanup - -[Service] -type=oneshot -User=neutron -Group=neutron -WorkingDirectory=/var/lib/neutron -PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStart=/etc/init.d/neutron-linuxbridge-cleanup systemd-start -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target - diff --git a/templates/git/neutron-macvtap-agent.init.in.template b/templates/git/neutron-macvtap-agent.init.in.template deleted file mode 100644 index b820b729..00000000 --- a/templates/git/neutron-macvtap-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-macvtap-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Macvtap L2 agent -# Description: Provide Macvtap L2 agent for Neutron -### END INIT INFO - -# Author: Corey Bryant - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron Macvtap L2 agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-macvtap-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/macvtap_agent.ini" diff --git a/templates/git/neutron-metadata-agent.init.in.template b/templates/git/neutron-metadata-agent.init.in.template deleted file mode 100644 index 2ba35b37..00000000 --- a/templates/git/neutron-metadata-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-metadata-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Should-Stop: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Metadata Agent agent -# Description: Provide Metadata agent for neutron -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron Metadata Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-metadata-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/metadata_agent.ini" diff --git a/templates/git/neutron-metering-agent.init.in.template b/templates/git/neutron-metering-agent.init.in.template deleted file mode 100644 index 0ca6db90..00000000 --- a/templates/git/neutron-metering-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-metering-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Should-Stop: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Metering Agent agent -# Description: Provides Metering agent for neutron -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron Metering Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-metering-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/metering_agent.ini" diff --git a/templates/git/neutron-openvswitch-agent.init.in.template b/templates/git/neutron-openvswitch-agent.init.in.template deleted file mode 100644 index bb8d151d..00000000 --- a/templates/git/neutron-openvswitch-agent.init.in.template +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-openvswitch-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs openvswitch-switch -# Should-Start: mysql postgresql rabbitmq-server keystone neutron-ovs-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Open vSwitch Agent -# Description: Open vSwitch agent for OpenStack Neutron ML2 plugin -### END INIT INFO - -# Authors: Julien Danjou , Thomas Goirand - -DESC="Openstack Neutron Open vSwitch Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-openvswitch-agent -DAEMON={{ daemon_path }} -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/openvswitch_agent.ini" diff --git a/templates/git/neutron-openvswitch-agent.service.in b/templates/git/neutron-openvswitch-agent.service.in deleted file mode 100644 index 426e18f2..00000000 --- a/templates/git/neutron-openvswitch-agent.service.in +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Openstack Neutron Open vSwitch Plugin Agent -After=mysql.service postgresql.service rabbitmq-server.service keystone.service -Requires=neutron-ovs-cleanup.service - -[Service] -User=neutron -Group=neutron -WorkingDirectory=/var/lib/neutron -PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStart=/etc/init.d/neutron-openvswitch-agent systemd-start -Restart=on-failure -LimitNOFILE=65535 - -[Install] -WantedBy=multi-user.target - diff --git a/templates/git/neutron-ovs-cleanup.init.in.template b/templates/git/neutron-ovs-cleanup.init.in.template deleted file mode 100644 index 4dec9a23..00000000 --- a/templates/git/neutron-ovs-cleanup.init.in.template +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-ovs-cleanup -# Required-Start: $network $local_fs $remote_fs $syslog openvswitch-switch -# Required-Stop: $remote_fs -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron OVS Cleanup -# Description: OpenvSwitch Cleanup for OpenStack Neutron -### END INIT INFO - -# Authors: James Page - -DESC="OpenStack Neutron OVS cleanup" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-ovs-cleanup -DAEMON={{ daemon_path }} diff --git a/templates/git/neutron-ovs-cleanup.service.in b/templates/git/neutron-ovs-cleanup.service.in deleted file mode 100644 index 0fec8fb1..00000000 --- a/templates/git/neutron-ovs-cleanup.service.in +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=OpenStack Neutron OVS cleanup - -[Service] -type=oneshot -User=neutron -Group=neutron -WorkingDirectory=/var/lib/neutron -PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStart=/etc/init.d/neutron-ovs-cleanup systemd-start -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target - diff --git a/templates/git/neutron-plugin-openvswitch-agent.init.in.template b/templates/git/neutron-plugin-openvswitch-agent.init.in.template deleted file mode 100644 index efece1a2..00000000 --- a/templates/git/neutron-plugin-openvswitch-agent.init.in.template +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-plugin-openvswitch-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs openvswitch-switch -# Should-Start: mysql postgresql rabbitmq-server keystone neutron-ovs-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron Open vSwitch Agent -# Description: Open vSwitch agent for OpenStack Neutron ML2 plugin -### END INIT INFO - -# Authors: Julien Danjou , Thomas Goirand - -DESC="Openstack Neutron Open vSwitch Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-plugin-openvswitch-agent -DAEMON={{ daemon_path }} -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/openvswitch_agent.ini" diff --git a/templates/git/neutron-plugin-openvswitch-agent.service.in b/templates/git/neutron-plugin-openvswitch-agent.service.in deleted file mode 100644 index d847db13..00000000 --- a/templates/git/neutron-plugin-openvswitch-agent.service.in +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Openstack Neutron Open vSwitch Plugin Agent -After=mysql.service postgresql.service rabbitmq-server.service keystone.service -Requires=neutron-ovs-cleanup.service - -[Service] -User=neutron -Group=neutron -WorkingDirectory=/var/lib/neutron -PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron -ExecStart=/etc/init.d/neutron-plugin-openvswitch-agent systemd-start -Restart=on-failure -LimitNOFILE=65535 - -[Install] -WantedBy=multi-user.target - diff --git a/templates/git/neutron-server.init.in.template b/templates/git/neutron-server.init.in.template deleted file mode 100644 index 7540ecdb..00000000 --- a/templates/git/neutron-server.init.in.template +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: neutron-server -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: neutron-server -# Description: Provides the Neutron networking service -### END INIT INFO - -DESC="OpenStack Neutron Server" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-server -DAEMON={{ daemon_path }} -[ -r /etc/default/neutron-server ] && . /etc/default/neutron-server -[ -n "$NEUTRON_PLUGIN_CONFIG" ] && DAEMON_ARGS="--config-file=$NEUTRON_PLUGIN_CONFIG" diff --git a/templates/git/neutron-sriov-agent.init.in.template b/templates/git/neutron-sriov-agent.init.in.template deleted file mode 100644 index 65c198f8..00000000 --- a/templates/git/neutron-sriov-agent.init.in.template +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-sriov-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron SRIOV Agent -# Description: SRIOV agent for OpenStack Neutron -### END INIT INFO - -# Authors: James Page - -DESC="OpenStack Neutron SRIOV Plugin Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-sriov-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be appended -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/sriov_agent.ini" diff --git a/templates/git/neutron-vpn-agent.init.in.template b/templates/git/neutron-vpn-agent.init.in.template deleted file mode 100644 index d85c160d..00000000 --- a/templates/git/neutron-vpn-agent.init.in.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-vpn-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone openvswitch-switch neutron-ovs-cleanup -# Should-Stop: mysql postgresql rabbitmq-server keystone openvswitch-switch -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron VPN Agent agent -# Description: Provides VPN agent for neutron -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Neutron VPN Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-vpn-agent -DAEMON={{ daemon_path }} -# --config-file=/etc/neutron/neutron.conf will be happened -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini --config-file=/etc/neutron/vpn_agent.ini" diff --git a/templates/git/neutron_sudoers b/templates/git/neutron_sudoers deleted file mode 100644 index d6fec647..00000000 --- a/templates/git/neutron_sudoers +++ /dev/null @@ -1,4 +0,0 @@ -Defaults:neutron !requiretty - -neutron ALL = (root) NOPASSWD: /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * - diff --git a/templates/git/nova-api-metadata.init.in.template b/templates/git/nova-api-metadata.init.in.template deleted file mode 100644 index 9c82b3a0..00000000 --- a/templates/git/nova-api-metadata.init.in.template +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: nova-api-metadata -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: postgresql mysql keystone rabbitmq-server ntp -# Should-Stop: postgresql mysql keystone rabbitmq-server ntp -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Nova API metadata server -# Description: Frontend Nova API metadata server -### END INIT INFO - -# Author: Julien Danjou - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="OpenStack Compute metadata API" -PROJECT_NAME=nova -NAME=${PROJECT_NAME}-api-metadata -DAEMON={{ daemon_path }} diff --git a/templates/git/nova_sudoers b/templates/git/nova_sudoers deleted file mode 100644 index 9bed09a0..00000000 --- a/templates/git/nova_sudoers +++ /dev/null @@ -1,4 +0,0 @@ -Defaults:nova !requiretty - -nova ALL = (root) NOPASSWD: /usr/local/bin/nova-rootwrap /etc/nova/rootwrap.conf * - diff --git a/templates/git/upstart/neutron-agent.upstart b/templates/git/upstart/neutron-agent.upstart deleted file mode 100644 index b3a4fd72..00000000 --- a/templates/git/upstart/neutron-agent.upstart +++ /dev/null @@ -1,25 +0,0 @@ -description "{{ service_description }}" -author "Juju {{ service_name }} Charm " - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron - # Check to see if openvswitch plugin in use by checking - # status of cleanup upstart configuration - if status neutron-ovs-cleanup; then - start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER={{ process_name }} - fi -end script - -exec start-stop-daemon --start --chuid neutron --exec {{ executable_name }} -- \ - {% for config_file in config_files -%} - --config-file={{ config_file }} \ - {% endfor -%} - --log-file={{ log_file }} diff --git a/templates/git/upstart/neutron-ovs-cleanup.upstart b/templates/git/upstart/neutron-ovs-cleanup.upstart deleted file mode 100644 index 2bb07444..00000000 --- a/templates/git/upstart/neutron-ovs-cleanup.upstart +++ /dev/null @@ -1,13 +0,0 @@ -description "{{ service_description }}" -author "Juju {{ service_name }} Charm " - -start on started openvswitch-switch -stop on runlevel [!2345] - -pre-start script - [ ! -x /usr/local/bin/{{ process_name }} ] && exit 0 - start-stop-daemon --start --chuid neutron \ - --exec {{ executable_name }} -- \ - --log-file {{ log_file }} \ - --config-file {{ config_file }} --verbose -end script diff --git a/templates/git/upstart/neutron-server.upstart b/templates/git/upstart/neutron-server.upstart deleted file mode 100644 index c19288c4..00000000 --- a/templates/git/upstart/neutron-server.upstart +++ /dev/null @@ -1,22 +0,0 @@ -description "{{ service_description }}" -author "Juju {{ service_name }} Charm " - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron -end script - -script - [ -r /etc/default/{{ process_name }} ] && . /etc/default/{{ process_name }} - [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" - exec start-stop-daemon --start --chuid neutron --exec {{ executable_name }} -- \ - --config-file /etc/neutron/neutron.conf \ - --log-file /var/log/neutron/server.log $CONF_ARG -end script diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf index e5f384f0..b1ffd4a2 100644 --- a/templates/kilo/neutron.conf +++ b/templates/kilo/neutron.conf @@ -15,8 +15,6 @@ network_device_mtu = {{ network_device_mtu }} api_workers = {{ workers }} rpc_response_timeout = {{ rpc_response_timeout }} -{% include "section-zeromq" %} - [agent] root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf report_interval = {{ report_interval }} diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf index 867c6bf1..fe44fd4d 100644 --- a/templates/kilo/nova.conf +++ b/templates/kilo/nova.conf @@ -17,8 +17,6 @@ multi_host=True network_api_class=nova.network.neutronv2.api.API metadata_workers = {{ workers }} -{% include "section-zeromq" %} - [neutron] auth_strategy=keystone url={{ quantum_url }} diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf index 0f92d506..07fdd8a3 100644 --- a/templates/mitaka/neutron.conf +++ b/templates/mitaka/neutron.conf @@ -13,8 +13,6 @@ network_device_mtu = {{ network_device_mtu }} api_workers = {{ workers }} rpc_response_timeout = {{ rpc_response_timeout }} -{% include "section-zeromq" %} - [agent] root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf report_interval = {{ report_interval }} diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf index ad7b67c5..6753ea4f 100644 --- a/templates/mitaka/nova.conf +++ b/templates/mitaka/nova.conf @@ -18,8 +18,6 @@ network_api_class=nova.network.neutronv2.api.API use_neutron = True metadata_workers = {{ workers }} -{% include "section-zeromq" %} - [neutron] url={{ quantum_url }} auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}