From c9f8d7a7d339cb20770d0b4d164f390c1f0e3044 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 31 Jul 2013 23:07:05 +0800 Subject: [PATCH] Kills all the plugin packages: that was insane! Rewritten-From: ed19f90eb3304a0457f28f4588641d1c2e94cb5d --- trusty/debian/control | 181 ------------------ .../debian/neutron-plugin-bigswitch.install | 1 - trusty/debian/neutron-plugin-brocade.install | 1 - trusty/debian/neutron-plugin-cisco.install | 1 - trusty/debian/neutron-plugin-hyperv.install | 1 - .../debian/neutron-plugin-linuxbridge.install | 1 - .../neutron-plugin-metaplugin.config.in | 15 -- .../debian/neutron-plugin-metaplugin.install | 2 - .../neutron-plugin-metaplugin.postinst.in | 25 --- .../debian/neutron-plugin-metaplugin.postrm | 16 -- .../neutron-plugin-metaplugin.templates | 32 ---- trusty/debian/neutron-plugin-nec.install | 1 - trusty/debian/neutron-plugin-nicira.install | 1 - trusty/debian/neutron-plugin-plumgrid.install | 1 - 14 files changed, 279 deletions(-) delete mode 100644 trusty/debian/neutron-plugin-bigswitch.install delete mode 100644 trusty/debian/neutron-plugin-brocade.install delete mode 100644 trusty/debian/neutron-plugin-cisco.install delete mode 100644 trusty/debian/neutron-plugin-hyperv.install delete mode 100644 trusty/debian/neutron-plugin-linuxbridge.install delete mode 100644 trusty/debian/neutron-plugin-metaplugin.config.in delete mode 100644 trusty/debian/neutron-plugin-metaplugin.install delete mode 100644 trusty/debian/neutron-plugin-metaplugin.postinst.in delete mode 100644 trusty/debian/neutron-plugin-metaplugin.postrm delete mode 100644 trusty/debian/neutron-plugin-metaplugin.templates delete mode 100644 trusty/debian/neutron-plugin-nec.install delete mode 100644 trusty/debian/neutron-plugin-nicira.install delete mode 100644 trusty/debian/neutron-plugin-plumgrid.install diff --git a/trusty/debian/control b/trusty/debian/control index 0d80586ad..f2b96a54c 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -144,7 +144,6 @@ Depends: adduser, debconf, lsb-base, neutron-common (= ${source:Version}), - neutron-plugin-openvswitch | neutron-plugin, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -182,48 +181,11 @@ Description: OpenStack virtual network service - common files . This package provides the common files. -Package: neutron-plugin-cisco -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: python-quantum -Replaces: python-quantum -Description: OpenStack virtual network service - Cisco plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the plugin to use with Cisco hardware. - -Package: neutron-plugin-nec -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: python-quantum -Replaces: python-quantum -Description: OpenStack virtual network service - NEC plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the NEC plugin. - Package: neutron-plugin-nec-agent Architecture: all Provides: neutron-plugin Pre-Depends: dpkg (>= 1.15.6~) Depends: neutron-common (= ${source:Version}), - neutron-plugin-nec, sudo, ${misc:Depends}, ${python:Depends}, @@ -238,105 +200,6 @@ Description: OpenStack virtual network service - NEC agent . This package provides the NEC plugin agent. -Package: neutron-plugin-bigswitch -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Neutron virtual network service - BigSwitch plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the BigSwitch plugin. - -Package: neutron-plugin-hyperv -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Neutron virtual network service - Hyper-V plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the Hyper-V plugin. - -Package: neutron-plugin-brocade -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - Brocade plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the Brocade plugin. - -Package: neutron-plugin-plumgrid -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Neutron virtual network service - PLUMgrid plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the PLUMgrid plugin. - -Package: neutron-plugin-metaplugin -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: adduser, - neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Neutron virtual network service - metaplugin plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the Metaplugin plugin. - -Package: neutron-plugin-nicira -Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: python-quantum -Replaces: python-quantum -Description: OpenStack virtual network service - Nicira NVP plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the plugin to use with Nicira Network Virtualization - Platform (NVP) controllers. - Package: neutron-l3-agent Architecture: all Pre-Depends: dpkg (>= 1.15.6~) @@ -412,35 +275,11 @@ Description: OpenStack virtual network service - LBaaS agent . This package provides the Load Balancing as a Service (LBaaS) agent. -Package: neutron-plugin-openvswitch -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: adduser, - dbconfig-common, - debconf, - neutron-common (= ${source:Version}), - sqlite3, - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: python-quantum -Replaces: python-quantum -Recommends: openvswitch-datapath-dkms -Description: OpenStack virtual network service - Open vSwitch plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the plugin to use with Open vSwitch. - Package: neutron-plugin-openvswitch-agent Architecture: all Pre-Depends: dpkg (>= 1.15.6~), openvswitch-switch Depends: openvswitch-switch, neutron-common (= ${source:Version}), - neutron-plugin-openvswitch, sudo, ${misc:Depends}, ${python:Depends}, @@ -457,31 +296,11 @@ Description: OpenStack virtual network service - Open vSwitch agent This package provides the Open vSwitch agent. If you choose to use the Open vSwitch plugin on neutron-server, this agent should run on each compute node. -Package: neutron-plugin-linuxbridge -Architecture: all -Provides: neutron-plugin -Pre-Depends: dpkg (>= 1.15.6~) -Depends: bridge-utils, - neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: python-quantum -Replaces: python-quantum -Description: OpenStack virtual network service - Linux bridge plugin - Neutron provides an API to dynamically request and configure virtual networks. - These networks connect "interfaces" from other OpenStack services (such as - vNICs from Nova VMs). The Neutron API supports extensions to provide advanced - network capabilities, including QoS, ACLs, and network monitoring. - . - This package provides the Linux bridge plugin. - Package: neutron-plugin-linuxbridge-agent Architecture: all Pre-Depends: dpkg (>= 1.15.6~) Depends: bridge-utils, neutron-common (= ${source:Version}), - neutron-plugin-linuxbridge, sudo, ${misc:Depends}, ${python:Depends}, diff --git a/trusty/debian/neutron-plugin-bigswitch.install b/trusty/debian/neutron-plugin-bigswitch.install deleted file mode 100644 index 73e8451d6..000000000 --- a/trusty/debian/neutron-plugin-bigswitch.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/bigswitch/* etc/neutron/plugins/bigswitch diff --git a/trusty/debian/neutron-plugin-brocade.install b/trusty/debian/neutron-plugin-brocade.install deleted file mode 100644 index ef68dc882..000000000 --- a/trusty/debian/neutron-plugin-brocade.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/brocade/* etc/neutron/plugins/brocade diff --git a/trusty/debian/neutron-plugin-cisco.install b/trusty/debian/neutron-plugin-cisco.install deleted file mode 100644 index 0c4968fb4..000000000 --- a/trusty/debian/neutron-plugin-cisco.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco diff --git a/trusty/debian/neutron-plugin-hyperv.install b/trusty/debian/neutron-plugin-hyperv.install deleted file mode 100644 index 2d8f762cf..000000000 --- a/trusty/debian/neutron-plugin-hyperv.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv diff --git a/trusty/debian/neutron-plugin-linuxbridge.install b/trusty/debian/neutron-plugin-linuxbridge.install deleted file mode 100644 index 4ea480748..000000000 --- a/trusty/debian/neutron-plugin-linuxbridge.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge diff --git a/trusty/debian/neutron-plugin-metaplugin.config.in b/trusty/debian/neutron-plugin-metaplugin.config.in deleted file mode 100644 index c8874cfa2..000000000 --- a/trusty/debian/neutron-plugin-metaplugin.config.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -META_CONF=/etc/neutron/metadata_agent.ini - -#PKGOS-INCLUDE# - -pkgos_var_user_group neutron -chmod 755 /var/lib/neutron -pkgos_read_admin_creds ${META_CONF} DEFAULT neutron-plugin-metaplugin - -exit 0 diff --git a/trusty/debian/neutron-plugin-metaplugin.install b/trusty/debian/neutron-plugin-metaplugin.install deleted file mode 100644 index b2cde8d0a..000000000 --- a/trusty/debian/neutron-plugin-metaplugin.install +++ /dev/null @@ -1,2 +0,0 @@ -etc/metadata_agent.ini usr/share/neutron-plugin-metaplugin -etc/neutron/plugins/metaplugin/* etc/neutron/plugins/metaplugin diff --git a/trusty/debian/neutron-plugin-metaplugin.postinst.in b/trusty/debian/neutron-plugin-metaplugin.postinst.in deleted file mode 100644 index 674aeb403..000000000 --- a/trusty/debian/neutron-plugin-metaplugin.postinst.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -META_CONF="/etc/neutron/metadata_agent.ini" - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ]; then - . /usr/share/debconf/confmodule - - pkgos_var_user_group neutron - chmod 755 /var/lib/neutron - if [ ! -d /etc/neutron ] ; then - mkdir -p /etc/neutron - fi - if [ ! -e "${META_CONF}" ] ; then - install -D -m 640 -o neutron -g neutron /usr/share/neutron-plugin-metaplugin/metadata_agent.ini ${META_CONF} - fi - pkgos_write_admin_creds ${META_CONF} DEFAULT neutron-plugin-metaplugin -fi - -#DEBHELPER# - -exit 0 diff --git a/trusty/debian/neutron-plugin-metaplugin.postrm b/trusty/debian/neutron-plugin-metaplugin.postrm deleted file mode 100644 index 583d59ebd..000000000 --- a/trusty/debian/neutron-plugin-metaplugin.postrm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - if [ -e /etc/neutron/metadata_agent.ini ] ; then - rm -f /etc/neutron/metadata_agent.ini - fi - if [ -d /etc/neutron ] ; then - rmdir --ignore-fail-on-non-empty /etc/neutron || true - fi -fi - -#DEBHELPER# - -exit 0 diff --git a/trusty/debian/neutron-plugin-metaplugin.templates b/trusty/debian/neutron-plugin-metaplugin.templates deleted file mode 100644 index ced188fb1..000000000 --- a/trusty/debian/neutron-plugin-metaplugin.templates +++ /dev/null @@ -1,32 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: neutron-plugin-metaplugin/auth-host -Type: string -Default: 127.0.0.1 -_Description: Authentication server hostname: - Please specify the hostname of the authentication server. Typically - this is also the hostname of the OpenStack Identity Service (Keystone). - -Template: neutron-plugin-metaplugin/admin-tenant-name -Type: string -Default: admin -_Description: Authentication server tenant name: - Please specify the authentication server tenant name. - -Template: neutron-plugin-metaplugin/admin-user -Type: string -Default: admin -_Description: Authentication server username: - Please specify the username to use with the authentication server. - -Template: neutron-plugin-metaplugin/admin-password -Type: password -_Description: Authentication server password: - Please specify the password to use with the authentication server. diff --git a/trusty/debian/neutron-plugin-nec.install b/trusty/debian/neutron-plugin-nec.install deleted file mode 100644 index b8903f6f7..000000000 --- a/trusty/debian/neutron-plugin-nec.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/nec/* etc/neutron/plugins/nec diff --git a/trusty/debian/neutron-plugin-nicira.install b/trusty/debian/neutron-plugin-nicira.install deleted file mode 100644 index cfee84e05..000000000 --- a/trusty/debian/neutron-plugin-nicira.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira diff --git a/trusty/debian/neutron-plugin-plumgrid.install b/trusty/debian/neutron-plugin-plumgrid.install deleted file mode 100644 index bed2da117..000000000 --- a/trusty/debian/neutron-plugin-plumgrid.install +++ /dev/null @@ -1 +0,0 @@ -etc/neutron/plugins/plumgrid/* etc/neutron/plugins/plumgrid -- 2.45.2