From 175a804ae2b4630acba90e364d3bc48b750a04e6 Mon Sep 17 00:00:00 2001 From: Oleksandr Zharov Date: Wed, 3 Jan 2024 20:13:02 +0100 Subject: [PATCH] Remove openstack integration Removed openstack integration and cleaned up remnants of no more active openstack project. JIRA: INTTEST-140 Change-Id: Id76b2ae4da2142390c450fde23e7e4ddb2b99674 Signed-off-by: Oleksandr Zharov --- csit/scripts/set_federation_rabbit.sh | 59 ------ csit/variables/Variables.py | 3 - csit/variables/Variables.robot | 2 - tools/odl-openstack-integration/Vagrantfile | 186 ------------------ .../puppet/hiera.yaml | 10 - .../puppet/hieradata/hosts.json | 20 -- .../puppet/manifests/base.pp | 12 -- .../puppet/manifests/devstack-compute.pp | 17 -- .../puppet/manifests/devstack-control.pp | 17 -- .../puppet/scripts/bootstrap.sh | 56 ------ .../puppet/templates/compute.local.conf.erb | 55 ------ .../puppet/templates/control.local.conf.erb | 64 ------ .../puppet/templates/hosts.erb | 8 - 13 files changed, 509 deletions(-) delete mode 100644 csit/scripts/set_federation_rabbit.sh delete mode 100644 tools/odl-openstack-integration/Vagrantfile delete mode 100644 tools/odl-openstack-integration/puppet/hiera.yaml delete mode 100644 tools/odl-openstack-integration/puppet/hieradata/hosts.json delete mode 100644 tools/odl-openstack-integration/puppet/manifests/base.pp delete mode 100644 tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp delete mode 100644 tools/odl-openstack-integration/puppet/manifests/devstack-control.pp delete mode 100644 tools/odl-openstack-integration/puppet/scripts/bootstrap.sh delete mode 100644 tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb delete mode 100644 tools/odl-openstack-integration/puppet/templates/control.local.conf.erb delete mode 100644 tools/odl-openstack-integration/puppet/templates/hosts.erb diff --git a/csit/scripts/set_federation_rabbit.sh b/csit/scripts/set_federation_rabbit.sh deleted file mode 100644 index 712aa15d86..0000000000 --- a/csit/scripts/set_federation_rabbit.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -if [[ ${CONTROLLERFEATURES} == *federation* ]]; then - -cat > ${WORKSPACE}/install_federation_rabbit.sh < ${WORKSPACE}/configure_federation_rabbit.sh <.*\$1.*\$2 "stable/havana" - } - end - end - - config.vm.define "ds-c1-havana" do |dsc1h| - dsc1h.vm.box = "saucy64" - dsc1h.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc1h.vm.hostname = "ds-c1" - dsc1h.vm.network "private_network", ip: "192.168.50.21" - dsc1h.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc1h.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "ds-compute.pp" - puppet.facter = { - "devstack_branch" => "stable/havana" - } - end - end - - config.vm.define "ds-c2-havana" do |dsc2h| - dsc2h.vm.box = "saucy64" - dsc2h.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc2h.vm.hostname = "ds-c2" - dsc2h.vm.network "private_network", ip: "192.168.50.22" - dsc2h.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc2h.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "ds-compute.pp" - puppet.facter = { - "devstack_branch" => "stable/havana" - } - end - end - - config.vm.define "ds-ctl-icehouse" do |dsctli| - dsctli.vm.box = "saucy64" - dsctli.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsctli.vm.hostname = "ds-ctl" - dsctli.vm.network "private_network", ip: "192.168.50.20" - dsctli.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsctli.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-control.pp" - puppet.facter = { - "devstack_branch" => "stable/icehouse" - } - end - end - - config.vm.define "ds-c1-icehouse" do |dsc1i| - dsc1i.vm.box = "saucy64" - dsc1i.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc1i.vm.hostname = "ds-c1" - dsc1i.vm.network "private_network", ip: "192.168.50.21" - dsc1i.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc1i.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-compute.pp" - puppet.facter = { - "devstack_branch" => "stable/icehouse" - } - end - end - - config.vm.define "ds-c2-icehouse" do |dsc2i| - dsc2i.vm.box = "saucy64" - dsc2i.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc2i.vm.hostname = "ds-c2" - dsc2i.vm.network "private_network", ip: "192.168.50.22" - dsc2i.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc2i.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-compute.pp" - puppet.facter = { - "devstack_branch" => "stable/icehouse" - } - end - end - - config.vm.define "ds-ctl-juno" do |dsctlj| - dsctlj.vm.box = "saucy64" - dsctlj.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsctlj.vm.hostname = "ds-ctl" - dsctlj.vm.network "private_network", ip: "192.168.50.20" - dsctlj.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsctlj.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-control.pp" - puppet.facter = { - "devstack_branch" => "master" - } - end - end - - config.vm.define "ds-c1-juno" do |dsc1j| - dsc1j.vm.box = "saucy64" - dsc1j.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc1j.vm.hostname = "ds-c1" - dsc1j.vm.network "private_network", ip: "192.168.50.21" - dsc1j.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc1j.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-compute.pp" - puppet.facter = { - "devstack_branch" => "master" - } - end - end - - config.vm.define "ds-c2-juno" do |dsc2j| - dsc2j.vm.box = "saucy64" - dsc2j.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box" - dsc2j.vm.hostname = "ds-c2" - dsc2j.vm.network "private_network", ip: "192.168.50.22" - dsc2j.vm.provider :virtualbox do |vb| - vb.memory = 4096 - end - dsc2j.vm.provision "puppet" do |puppet| - puppet.hiera_config_path = "puppet/hiera.yaml" - puppet.working_directory = "/vagrant/puppet" - puppet.manifests_path = "puppet/manifests" - puppet.manifest_file = "devstack-compute.pp" - puppet.facter = { - "devstack_branch" => "master" - } - end - end - -end diff --git a/tools/odl-openstack-integration/puppet/hiera.yaml b/tools/odl-openstack-integration/puppet/hiera.yaml deleted file mode 100644 index a93e1d9fdc..0000000000 --- a/tools/odl-openstack-integration/puppet/hiera.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -:backends: - - yaml - - json -:yaml: - :datadir: /vagrant/puppet/hieradata -:json: - :datadir: /vagrant/puppet/hieradata -:hierarchy: - - hosts diff --git a/tools/odl-openstack-integration/puppet/hieradata/hosts.json b/tools/odl-openstack-integration/puppet/hieradata/hosts.json deleted file mode 100644 index d5feaae440..0000000000 --- a/tools/odl-openstack-integration/puppet/hieradata/hosts.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "hosts": { - "opendaylight": { - "name": "opendaylight", - "ipaddress": "192.168.50.1" - }, - "ds-ctl": { - "name": "ds-ctl", - "ipaddress": "192.168.50.20" - }, - "ds-c1": { - "name": "ds-c1", - "ipaddress": "192.168.50.21" - }, - "ds-c2": { - "name": "ds-c2", - "ipaddress": "192.168.50.22" - } - } -} diff --git a/tools/odl-openstack-integration/puppet/manifests/base.pp b/tools/odl-openstack-integration/puppet/manifests/base.pp deleted file mode 100644 index 6622d16737..0000000000 --- a/tools/odl-openstack-integration/puppet/manifests/base.pp +++ /dev/null @@ -1,12 +0,0 @@ -package {'git': - ensure => 'installed' -} - -$hosts = hiera('hosts') - -file { '/etc/hosts': - ensure => file, - owner => 'root', - group => 'root', - content => template('/vagrant/puppet/templates/hosts.erb') -} diff --git a/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp b/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp deleted file mode 100644 index b97f7e85b1..0000000000 --- a/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp +++ /dev/null @@ -1,17 +0,0 @@ -vcsrepo { '/home/vagrant/devstack': - ensure => present, - provider => git, - user => 'vagrant', - source => 'https://github.com/openstack-dev/devstack.git', - revision => $devstack_branch, - before => File['/home/vagrant/devstack/local.conf'] -} - -$hosts = hiera('hosts') - -file { '/home/vagrant/devstack/local.conf': - ensure => present, - owner => 'vagrant', - group => 'vagrant', - content => template('/vagrant/puppet/templates/compute.local.conf.erb') -} diff --git a/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp b/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp deleted file mode 100644 index 9bc7f3ad00..0000000000 --- a/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp +++ /dev/null @@ -1,17 +0,0 @@ -vcsrepo { '/home/vagrant/devstack': - ensure => present, - provider => git, - user => 'vagrant', - source => 'https://github.com/openstack-dev/devstack.git', - revision => $devstack_branch, - before => File['/home/vagrant/devstack/local.conf'] -} - -$hosts = hiera('hosts') - -file { '/home/vagrant/devstack/local.conf': - ensure => present, - owner => 'vagrant', - group => 'vagrant', - content => template('/vagrant/puppet/templates/control.local.conf.erb') -} diff --git a/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh b/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh deleted file mode 100644 index 6895b7df6d..0000000000 --- a/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash -# -# This bootstraps Puppet on Ubuntu 12.04 LTS. -# -set -e - -# Load up the release information -. /etc/lsb-release - -REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release-${DISTRIB_CODENAME}.deb" - -#-------------------------------------------------------------------- -# NO TUNABLES BELOW THIS POINT -#-------------------------------------------------------------------- -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root." >&2 - exit 1 - fi - - if which puppet > /dev/null 2>&1; then - echo "Puppet is already installed." - exit 0 - fi - - # Do the initial apt-get update - echo "Initial apt-get update..." - apt-get update >/dev/null - - # Install wget if we have to (some older Ubuntu versions) - echo "Installing wget..." - apt-get install -y wget >/dev/null - - # Install the PuppetLabs repo - echo "Configuring PuppetLabs repo..." - repo_deb_path=$(mktemp) - wget --output-document="${repo_deb_path}" "${REPO_DEB_URL}" 2>/dev/null - dpkg -i "${repo_deb_path}" >/dev/null - apt-get update >/dev/null - - # Install Puppet - echo "Installing Puppet..." - apt-get install -y puppet >/dev/null - - echo "Puppet installed!" - - # Install RubyGems for the provider - echo "Installing RubyGems..." - apt-get install -y rubygems >/dev/null - gem install --no-ri --no-rdoc rubygems-update - update_rubygems >/dev/null - - # Installing Puppet Modules - puppet module install puppetlabs/vcsrepo - puppet module install puppetlabs/stdlib - - diff --git a/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb b/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb deleted file mode 100644 index f99956ef39..0000000000 --- a/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb +++ /dev/null @@ -1,55 +0,0 @@ -[[local|localrc]] -SCREEN_LOGDIR=/opt/stack/log -LOGFILE=stack.sh.log -LOG_COLOR=False -#OFFLINE=True -#RECLONE=yes - -HOST_IP=<%= @hosts[@hostname]['ipaddress'] %> -HOST_NAME=<%= @hosts[@hostname]['name'] %> -SERVICE_HOST=<%= @hosts['ds-ctl']['name'] %> -SERVICE_HOST_NAME=<%= @hosts['ds-ctl']['name'] %> - -Q_HOST=$SERVICE_HOST -MYSQL_HOST=$SERVICE_HOST -RABBIT_HOST=$SERVICE_HOST -GLANCE_HOSTPORT=$SERVICE_HOST:9292 -KEYSTONE_AUTH_HOST=$SERVICE_HOST -KEYSTONE_SERVICE_HOST=$SERVICE_HOST - -MYSQL_PASSWORD=mysql -RABBIT_PASSWORD=rabbit -QPID_PASSWORD=rabbit -SERVICE_TOKEN=service -SERVICE_PASSWORD=admin -ADMIN_PASSWORD=admin - -VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP -VNCSERVER_LISTEN=0.0.0.0 - -disable_all_services -enable_service neutron quantum nova n-cpu n-novnc rabbit odl-compute - -# ODL WITH ML2 -Q_PLUGIN=ml2 -Q_ML2_PLUGIN_MECHANISM_DRIVERS=opendaylight,logger -ODL_MGR_IP=<%= @hosts['opendaylight']['ipaddress'] %> - -ENABLE_TENANT_TUNNELS=True -# Q_ML2_TENANT_NETWORK_TYPE=vlan -# ENABLE_TENANT_VLANS=True -Q_ML2_TENANT_NETWORK_TYPE=vxlan -#Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=vxlan) - -#FLOATING_RANGE=192.168.254.64/26 - -EXTRA_OPTS=(scheduler_default_filters=AllHostsFilter) - -[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]] -[agent] -minimize_polling=True - -[ml2_odl] -url=http://<%= @hosts['opendaylight']['ipaddress'] %>:8080/controller/nb/v2/neutron -username=admin -password=admin diff --git a/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb b/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb deleted file mode 100644 index 50f2cb716d..0000000000 --- a/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb +++ /dev/null @@ -1,64 +0,0 @@ -[[local|localrc]] -SCREEN_LOGDIR=/opt/stack/log -LOGFILE=stack.sh.log -LOG_COLOR=False -#OFFLINE=True -RECLONE=yes - -HOST_IP=<%= @hosts['ds-ctl']['ipaddress'] %> -HOST_NAME=<%= @hosts['ds-ctl']['name'] %> -SERVICE_HOST=$HOST_IP -SERVICE_HOST_NAME=$HOST_NAME - -Q_HOST=$SERVICE_HOST -MYSQL_HOST=$SERVICE_HOST -RABBIT_HOST=$SERVICE_HOST -GLANCE_HOSTPORT=$SERVICE_HOST:9292 -KEYSTONE_AUTH_HOST=$SERVICE_HOST -KEYSTONE_SERVICE_HOST=$SERVICE_HOST - -MYSQL_PASSWORD=mysql -RABBIT_PASSWORD=rabbit -QPID_PASSWORD=rabbit -SERVICE_TOKEN=service -SERVICE_PASSWORD=admin -ADMIN_PASSWORD=admin - -enable_service rabbit -disable_service qpid - -enable_service n-cond -enable_service n-cpu -enable_service n-novnc -disable_service n-net -enable_service q-svc -# enable_service q-agt -enable_service q-dhcp -enable_service q-l3 -enable_service q-meta -enable_service quantum -enable_service odl-compute - -# ODL WITH ML2 -Q_PLUGIN=ml2 -Q_ML2_PLUGIN_MECHANISM_DRIVERS=opendaylight,logger -ODL_MGR_IP=<%= @hosts['opendaylight']['ipaddress'] %> - -ENABLE_TENANT_TUNNELS=True -# ENABLE_TENANT_VLANS=True -# TENANT_VLAN_RANGE=500:510 - -Q_ML2_TENANT_NETWORK_TYPE=vxlan -# Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=vxlan) - -#FLOATING_RANGE=192.168.254.64/26 -#PUBLIC_NETWORK_GATEWAY=192.168.75.254 - -[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]] -[agent] -minimize_polling=True - -[ml2_odl] -url=http://<%= @hosts['opendaylight']['ipaddress'] %>:8080/controller/nb/v2/neutron -username=admin -password=admin diff --git a/tools/odl-openstack-integration/puppet/templates/hosts.erb b/tools/odl-openstack-integration/puppet/templates/hosts.erb deleted file mode 100644 index c23f40fca2..0000000000 --- a/tools/odl-openstack-integration/puppet/templates/hosts.erb +++ /dev/null @@ -1,8 +0,0 @@ -## Do Not Edit. Created by Puppet ## -127.0.0.1 localhost -255.255.255.255 broadcasthost -::1 localhost -fe80::1%lo0 localhost -<% @hosts.values.each do |h| %> -<%= h["ipaddress"] %> <%= h["name"] %> -<% end %> -- 2.36.6