From 3780e150ec1bbd21359cab6a8c22370b2d2be542 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 18 Dec 2019 19:31:08 +0100 Subject: [PATCH] Retire repository Fuel repositories are all retired in openstack namespace, retire remaining fuel repos in x namespace since they are unused now. This change removes all content from the repository and adds the usual README file to point out that the repository is retired following the process from https://docs.openstack.org/infra/manual/drivers.html#retiring-a-project See also http://lists.openstack.org/pipermail/openstack-discuss/2019-December/011675.html A related change is: https://review.opendev.org/699752 . Change-Id: I01a8a734f84a043fe78870c57f4d802731c0367e --- .gitignore | 7 -- README.md | 79 ----------------- README.rst | 10 +++ .../puppet/manifests/horizon_integration.pp | 16 ---- .../puppet/manifests/install-bgpvpn.pp | 24 ----- .../networking-bgpvpn/manifests/init.pp | 41 --------- .../templates/inject_service_plugins.sh | 24 ----- .../templates/networking_bgpvpn.conf.erb | 6 -- deployment_tasks.yaml | 21 ----- environment_config.yaml | 9 -- metadata.yaml | 30 ------- pre_build_hook | 88 ------------------- repositories/centos/.gitkeep | 0 repositories/ubuntu/.gitkeep | 0 14 files changed, 10 insertions(+), 345 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 README.rst delete mode 100644 deployment_scripts/puppet/manifests/horizon_integration.pp delete mode 100644 deployment_scripts/puppet/manifests/install-bgpvpn.pp delete mode 100644 deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp delete mode 100644 deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh delete mode 100644 deployment_scripts/puppet/modules/networking-bgpvpn/templates/networking_bgpvpn.conf.erb delete mode 100644 deployment_tasks.yaml delete mode 100644 environment_config.yaml delete mode 100644 metadata.yaml delete mode 100755 pre_build_hook delete mode 100644 repositories/centos/.gitkeep delete mode 100644 repositories/ubuntu/.gitkeep diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2c8465d..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -tmp/ -*.rpm -*.deb -.build/ -.cache/ -.project -.pydevproject diff --git a/README.md b/README.md deleted file mode 100644 index 50c842e..0000000 --- a/README.md +++ /dev/null @@ -1,79 +0,0 @@ -BGPVPN Plugin for Fuel -================================ - -BGPVPN plugin ------------------------ - -Overview --------- - -This is the Fuel plugin for the networking-bgpvpn project. - -Requirements ------------- - -| Requirement | Version/Comment | -|----------------------------------|-----------------| -| Mirantis OpenStack compatibility | 10.0 | - -Recommendations ---------------- - -None. - -Limitations ------------ - -Installation Guide -================== - -BGPVPN plugin installation ----------------------------------------- - -1. Clone the fuel-plugin-bgpvpn repo from github: - - git clone https://github.com/openstack/fuel-plugin-bgpvpn - -2. Install the Fuel Plugin Builder: - - pip install fuel-plugin-builder - -3. Install the [fpm gem](https://github.com/jordansissel/fpm): - - gem install fpm - -4. Build bgpvpn Fuel plugin: - - fpb --build fuel-plugin-bgpvpn/ - -5. The *bgpvpn-[x.x.x].rpm* plugin package will be created in the plugin folder. - -6. Move this file to the Fuel Master node with secure copy (scp): - - scp bgpnvpn-[x.x.x].rpm root@:/tmp - -7. While logged in Fuel Master install the BGPVPN plugin: - - fuel plugins --install bgpvpn-[x.x.x].rpm - -8. Check if the plugin was installed successfully: - - fuel plugins - - id | name | version | package_version - ---|--------------|---------|---------------- - 1 | bgpvpn | 0.1.0 | 3.0.0 - -9. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI. - - -User Guide -========== - -Contributors ------------- - -nikolas.hermanns@ericsson.com -mskalski@mirantis.com -tim.irnich@ericsson.com -rski@intracom-telecom.com diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..86e34d6 --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +This project is no longer maintained. + +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". + +For any further questions, please email +openstack-discuss@lists.openstack.org or join #openstack-dev on +Freenode. diff --git a/deployment_scripts/puppet/manifests/horizon_integration.pp b/deployment_scripts/puppet/manifests/horizon_integration.pp deleted file mode 100644 index fcbd558..0000000 --- a/deployment_scripts/puppet/manifests/horizon_integration.pp +++ /dev/null @@ -1,16 +0,0 @@ -file { '/usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_1495_project_bgpvpn_panel.py': - ensure => 'link', - target => '/usr/local/lib/python2.7/dist-packages/bgpvpn_dashboard/enabled/_1495_project_bgpvpn_panel.py', -} - - -file { '/usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_2115_admin_bgpvpn_panel.py': - ensure => 'link', - target => '/usr/local/lib/python2.7/dist-packages/bgpvpn_dashboard/enabled/_2115_admin_bgpvpn_panel.py', -} - -File <||> -~> -service { 'apache2': - ensure => running, -} diff --git a/deployment_scripts/puppet/manifests/install-bgpvpn.pp b/deployment_scripts/puppet/manifests/install-bgpvpn.pp deleted file mode 100644 index 98b280c..0000000 --- a/deployment_scripts/puppet/manifests/install-bgpvpn.pp +++ /dev/null @@ -1,24 +0,0 @@ -service { 'neutron-server': - ensure => running, -} - -$inject_script = '/tmp/inject_service_plugins.sh' -file { $inject_script: - ensure => file, - content => template('networking-bgpvpn/inject_service_plugins.sh'), -} -$neutron_conf_file='/etc/neutron/neutron.conf' -file { $neutron_conf_file: - ensure => file -} -exec { 'inject_service_plugins': - command => "bash $inject_script /etc/neutron/neutron.conf networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin", - require => File[$inject_script], - path => '/usr/local/bin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/sbin', - subscribe => File[$neutron_conf_file], -} - -class {'networking-bgpvpn': - notify => Service['neutron-server']} -class {'networking-bgpvpn-backend-config': - notify => Service['neutron-server']} diff --git a/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp b/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp deleted file mode 100644 index a04102f..0000000 --- a/deployment_scripts/puppet/modules/networking-bgpvpn/manifests/init.pp +++ /dev/null @@ -1,41 +0,0 @@ -class networking-bgpvpn { - - package {'python-networking-bgpvpn': - ensure => installed, - notify => Service['neutron-server'], - } - package {'networking-bgpvpn-config': - ensure => installed, - notify => Service['neutron-server'], - } - # fuel-library/puppet/neutron/manifest/server.pp: exec 'neutron-db-sync' was taken as - # example. In liberty it is not needed - exec { 'bgpvpn-db-sync': - command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head', - path => '/usr/local/bin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/sbin', - notify => Service['neutron-server'], - # TODO - #subscribe => Neutron_config['database/connection'], - tries => 10, - # TODO(bogdando) contribute change to upstream: - # new try_sleep param for sleep driven development (SDD) - try_sleep => 20, - require => Package["python-networking-bgpvpn"] - } - Exec<| title == 'neutron-db-sync' |> ~> Exec['bgpvpn-db-sync'] -} - -class networking-bgpvpn-backend-config { - - require networking-bgpvpn - if hiera('opendaylight', false) { - $NETWORKING_BGPVPN_DRIVER = 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default' - package {'python-networking-odl': - ensure => installed, - } - } - file { "/etc/neutron/networking_bgpvpn.conf": - ensure => file, - content => template('networking-bgpvpn/networking_bgpvpn.conf.erb'), - } -} diff --git a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh b/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh deleted file mode 100644 index 834cd91..0000000 --- a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/inject_service_plugins.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -e -usage() { - echo "usage: $0 " >&2 -} -if [[ $# -ne 2 ]]; then - usage - exit -fi -conf_file=$1 -service_plugin=$2 -if [ -e conf_file ]; then - echo "File: $conf_file not found." - exit 1 -fi -if ! grep -q "$service_plugin" $conf_file ; then - service_plugins=$(grep "^service_plugins" $conf_file) - sed -i "s/$service_plugins/$service_plugins,$service_plugin/" $conf_file -fi - -if ! grep -q "$service_plugin" $conf_file; then - echo "Could not add $service_plugin as service plugin in $conf_file." - exit 2 -fi diff --git a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/networking_bgpvpn.conf.erb b/deployment_scripts/puppet/modules/networking-bgpvpn/templates/networking_bgpvpn.conf.erb deleted file mode 100644 index 29a8701..0000000 --- a/deployment_scripts/puppet/modules/networking-bgpvpn/templates/networking_bgpvpn.conf.erb +++ /dev/null @@ -1,6 +0,0 @@ -[service_providers] -# both cannot be default, please choose: -service_provider=<%= @NETWORKING_BGPVPN_DRIVER %> -#service_provider=BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default - - diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml deleted file mode 100644 index 569e6bd..0000000 --- a/deployment_tasks.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- id: bgpvpn_configure - version: 2.0.0 - role: ['primary-controller', 'controller'] - requires: [post_deployment_start] - required_for: [post_deployment_end] - type: puppet - parameters: - puppet_manifest: puppet/manifests/install-bgpvpn.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 1400 - -- id: horizon_integration - version: 2.0.0 - role: ['primary-controller', 'controller'] - requires: [post_deployment_start] - required_for: [post_deployment_end] - type: puppet - parameters: - puppet_manifest: puppet/manifests/horizon_integration.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 1400 diff --git a/environment_config.yaml b/environment_config.yaml deleted file mode 100644 index 60680a3..0000000 --- a/environment_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -attributes: - metadata: - restrictions: - - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin" - - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled != true" - strict: false - message: "OpenDaylight plugin must be installed and enabled" - label: "BGPVPN plugin" - weight: 90 diff --git a/metadata.yaml b/metadata.yaml deleted file mode 100644 index 3495645..0000000 --- a/metadata.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Plugin name -name: bgpvpn -# Human-readable name for your plugin -title: BGPVPN plugin -# Plugin version -version: '1.0.0' -# Description -description: 'This plugin provides BGPVPN extension for neutron.' -# Required fuel version -fuel_version: ['10.0'] -# Specify license of your plugin -licenses: ['Apache License Version 2.0'] -# Specify author or company name -authors: ['Nikolas Hermanns, Ericsson'] -# A link to the plugin's page -homepage: 'https://github.com/openstack/fuel-plugin-bgpvpn' -# Specify a group which your plugin implements, possible options: -# network, storage, storage::cinder, storage::glance, hypervisor -groups: ['network'] - -# The plugin is compatible with releases in the list -releases: - - os: ubuntu - version: newton-10.0 - mode: ['ha', 'multinode'] - deployment_scripts_path: deployment_scripts/ - repository_path: repositories/ubuntu - -# Version of plugin package -package_version: '3.0.0' diff --git a/pre_build_hook b/pre_build_hook deleted file mode 100755 index ee71200..0000000 --- a/pre_build_hook +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Add here any the actions which are required before plugin build -# like packages building, packages downloading from mirrors and so on. -# The script should return 0 if there were no errors. -set -eux - -# Networking bgpvpn -NETWORKING_BGPVPN_REPO=${NETWORKING_BGPVPN_REPO:-https://github.com/openstack/networking-bgpvpn.git} - -NETWORKING_BGPVPN_BRANCH=${NETWORKING_BGPVPN_BRANCH:-stable/newton} - -#Networking odl -NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-https://github.com/openstack/networking-odl.git} -NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/newton} - -# For which systems odl package should be build -BUILD_FOR=${BUILD_FOR:-ubuntu} - -DIR="$(dirname `readlink -f $0`)" -TMP_DIR="${DIR}/tmp" - -#Remove temporary files -CLEANUP=${CLEANUP:-true} - -function cleanup { - rm -rf "${TMP_DIR}" -} - -function build_pkg { - # clean up old packages - rm -rf ${DIR}/repositories/${1}/* - case $1 in - ubuntu) - pushd "${DIR}/repositories/${1}/" - fpm --architecture all --force -s python -t deb -m 'mskalski@mirantis.com' \ - --python-disable-dependency oslo.config ${TMP_DIR}/networking-bgpvpn/setup.py - - # fpm -C is buggy https://github.com/jordansissel/fpm/issues/818 - # so we have to change the rootdir manually - pushd ${TMP_DIR}/networking-bgpvpn/ - fpm --architecture all --force -s dir -t deb -m 'nikolas.hermanns@ericsson.com' \ - --config-files etc -n networking-bgpvpn-config -v 1.0 etc - mv networking-bgpvpn-config_*.deb ${DIR}/repositories/${1}/ - popd - - # Networking odl is needed cause it is a dependencie. There is no way yet to make - # the bgpvpn installation waiting for the ODL installation, when ODL installation - # is optional: http://permalink.gmane.org/gmane.comp.cloud.openstack.devel/63333 - fpm --architecture all --force -s python -t deb -m 'nikolas.hermanns@ericsson.com' \ - --no-python-dependencies -d python-pbr -d python-babel -d python-neutron ${TMP_DIR}/networking_odl/setup.py - - popd - ;; - *) echo "Not supported system"; exit 1;; - esac -} - -command -v fpm >/dev/null 2>&1 || { echo >&2 "fpm ruby gem required but it's not installed. Aborting."; exit 1; } - -cleanup - - -mkdir -p "${TMP_DIR}" - - -pushd $TMP_DIR -git clone $NETWORKING_BGPVPN_REPO networking-bgpvpn -pushd networking-bgpvpn -git checkout $NETWORKING_BGPVPN_BRANCH -sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt -sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt -popd -git clone $NETWORKING_ODL_REPO networking_odl -pushd networking_odl -git checkout $NETWORKING_ODL_BRANCH -popd - -popd - -for system in $BUILD_FOR -do - build_pkg $system -done - -if [ "$CLEANUP" != false ];then - cleanup -fi diff --git a/repositories/centos/.gitkeep b/repositories/centos/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/repositories/ubuntu/.gitkeep b/repositories/ubuntu/.gitkeep deleted file mode 100644 index e69de29..0000000