From 97ac2e83e9fcb04eb4cbdfc38f3826a07aeedec8 Mon Sep 17 00:00:00 2001 From: blsaws Date: Thu, 7 Apr 2016 15:15:05 -0700 Subject: Remove install plan B development files (now merged) JIRA: COPPER-2 Change-Id: I35f1df3707be7479447242d7bfbd5c29298ac21b Signed-off-by: blsaws (cherry picked from commit 9e3aa006c86d62c4e15ed240ea33eaea04bbfd89) --- components/congress/joid/install_congress_1b.sh | 184 ------------------------ components/congress/joid/install_congress_2b.sh | 174 ---------------------- 2 files changed, 358 deletions(-) delete mode 100644 components/congress/joid/install_congress_1b.sh delete mode 100644 components/congress/joid/install_congress_2b.sh diff --git a/components/congress/joid/install_congress_1b.sh b/components/congress/joid/install_congress_1b.sh deleted file mode 100644 index 3fae1a9..0000000 --- a/components/congress/joid/install_congress_1b.sh +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This is script 1 of 2 for installation of Congress on an Ubuntu 14.04 -# LXC container in the OPNFV Controller node. -# Prequisite: OPFNV install per https://wiki.opnfv.org/copper/academy/joid -# -# On jumphost: -# Download admin-openrc.sh from Horizon and save in ~ -# source install_congress_1b.sh -# (copies install_congress_2b.sh to and executes it) -# is the name of the host in which to install Congress. -# -# If "horizon", Congress will be installed in the same LXC as Horizon, -# as necessary for the OpenStack Dashboard Policy plugins to work. -# Otherwise provide the node name of the controller node, where Congress -# will be installed in an LXC (NOTE: Policy plugin for OpenStack dashboard -# does not currently get installed for the LXC-based Congress deploy) - -if [ $# -gt 1 ] && [ $2 == "debug" ]; then set -x #echo on -fi - -source ~/admin-openrc.sh <~/env.sh -export CONGRESS_HOST=$CONGRESS_HOST -export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") -export KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") -export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") -export CINDER_HOST=$(juju status --format=short | awk "/cinder\/0/ { print \$3 }") -export GLANCE_HOST=$(juju status --format=short | awk "/glance\/0/ { print \$3 }") -export NEUTRON_HOST=$(juju status --format=short | awk "/neutron-api\/0/ { print \$3 }") -export NOVA_HOST=$(juju status --format=short | awk "/nova-cloud-controller\/0/ { print \$3 }") -EOF -source ~/env.sh -juju scp ~/admin-openrc.sh ubuntu@$CONGRESS_HOST:/home/ubuntu -juju scp ~/env.sh ubuntu@$CONGRESS_HOST:/home/ubuntu - -echo "Copy install_congress_2.sh to the congress server and execute" -juju scp ~/git/copper/components/congress/joid/install_congress_2b.sh ubuntu@$CONGRESS_HOST:/home/ubuntu -ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$CONGRESS_HOST "source ~/install_congress_2b.sh; exit" - -echo "Install jumphost dependencies" - -echo "Update package repos" -sudo apt-get update - -echo "install pip" -sudo apt-get install python-pip -y - -echo "install other dependencies" -sudo apt-get install apg git gcc python-dev libxml2 libxslt1-dev libzip-dev -y -sudo pip install --upgrade pip virtualenv setuptools pbr tox - -echo "Clone congress" -mkdir ~/git -cd ~/git -git clone https://github.com/openstack/congress.git -cd congress -git checkout stable/liberty - -echo "Create virtualenv" -virtualenv ~/git/congress -source bin/activate - -echo "Install and test OpenStack client" -cd ~/git -git clone https://github.com/openstack/python-openstackclient.git -cd python-openstackclient -git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . -openstack service list - -echo "Install and test Congress client" -cd ~/git -git clone https://github.com/openstack/python-congressclient.git -cd python-congressclient -git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . -openstack congress driver list - -echo "Install and test Keystone client" -cd ~/git -git clone https://github.com/openstack/python-keystoneclient.git -cd python-keystoneclient -git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . - -echo "setup Congress user. TODO: needs update in http://congress.readthedocs.org/en/latest/readme.html#installing-congress" -pip install cliff --upgrade -export ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }") -export SERVICE_TENANT=$(openstack project list | awk "/ admin / { print \$2 }") -openstack user create --password congress --project admin --email "congress@example.com" congress -export CONGRESS_USER=$(openstack user list | awk "/ congress / { print \$2 }") -openstack role add --user $CONGRESS_USER --project $SERVICE_TENANT $ADMIN_ROLE - -echo "Create Congress service" -openstack service create congress --type "policy" --description "Congress Service" -export CONGRESS_SERVICE=$(openstack service list | awk "/ congress / { print \$2 }") - -echo "Create Congress endpoint" -openstack endpoint create $CONGRESS_SERVICE \ - --region $OS_REGION_NAME \ - --publicurl http://$CONGRESS_HOST:1789/ \ - --adminurl http://$CONGRESS_HOST:1789/ \ - --internalurl http://$CONGRESS_HOST:1789/ - -echo "Start the Congress service" -ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$CONGRESS_HOST "~/git/congress/bin/congress-server &>/dev/null &" - -echo "Wait 30 seconds for Congress service to startup" -sleep 30 - -echo "Create data sources" -# To remove datasources: openstack congress datasource delete -openstack congress datasource create nova "nova" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -openstack congress datasource create neutronv2 "neutronv2" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -openstack congress datasource create ceilometer "ceilometer" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -openstack congress datasource create cinder "cinder" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -openstack congress datasource create glancev2 "glancev2" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 -openstack congress datasource create keystone "keystone" \ - --config username=$OS_USERNAME \ - --config tenant_name=$OS_TENANT_NAME \ - --config password=$OS_PASSWORD \ - --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 - -echo "Run Congress Tempest Tests" -cd ~/git/congress -# tox -epy27 - -set +x #echo off diff --git a/components/congress/joid/install_congress_2b.sh b/components/congress/joid/install_congress_2b.sh deleted file mode 100644 index 8891bab..0000000 --- a/components/congress/joid/install_congress_2b.sh +++ /dev/null @@ -1,174 +0,0 @@ -#!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is script 2 of 2 for installation of Congress on an Ubuntu 14.04 -# LXC container (same as Horizon) in the OPNFV Controller node. -# Prequisite: OPFNV install per https://wiki.opnfv.org/copper/academy/joid -# -# On jumphost: -# Download admin-openrc.sh from Horizon and save in ~ -# source install_congress_1b.sh -# (copies install_congress_2b.sh to and executes it) -# is the name of the host in which to install Congress. -# -# If "horizon", Congress will be installed in the same LXC as Horizon, -# as necessary for the OpenStack Dashboard Policy plugins to work. -# Otherwise provide the node name of the controller node, where Congress -# will be installed in an LXC (NOTE: Policy plugin for OpenStack dashboard -# does not currently get installed for the LXC-based Congress deploy) - -set -x -source ~/admin-openrc.sh </log_file = congress.log/g' etc/congress.conf.sample -sed -i -- 's/#log_dir = /log_dir = \/var\/log\/congress/g' etc/congress.conf.sample -sed -i -- 's/#bind_host = 0.0.0.0/bind_host = '$CONGRESS_HOST'/g' etc/congress.conf.sample -sed -i -- 's/#policy_path = /policy_path = \/etc\/congress\/snapshot/g' etc/congress.conf.sample -sed -i -- 's/#auth_strategy = keystone/auth_strategy = noauth/g' etc/congress.conf.sample -sed -i -- 's/#drivers =/drivers = congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver,congress.datasources.nova_driver.NovaDriver,congress.datasources.keystone_driver.KeystoneDriver,congress.datasources.ceilometer_driver.CeilometerDriver,congress.datasources.cinder_driver.CinderDriver/g' etc/congress.conf.sample -sed -i -- 's/#auth_host = 127.0.0.1/auth_host = '$CONGRESS_HOST'/g' etc/congress.conf.sample -sed -i -- 's/#auth_port = 35357/auth_port = 35357/g' etc/congress.conf.sample -sed -i -- 's/#auth_protocol = https/auth_protocol = http/g' etc/congress.conf.sample -sed -i -- 's/#admin_tenant_name = admin/admin_tenant_name = admin/g' etc/congress.conf.sample -sed -i -- 's/#admin_user = /admin_user = congress/g' etc/congress.conf.sample -sed -i -- 's/#admin_password = /admin_password = congress/g' etc/congress.conf.sample -sed -i -- 's/#connection = /connection = mysql:\/\/ubuntu:'$MYSQL_PASSWORD'@localhost:3306\/congress/g' etc/congress.conf.sample - -echo "copy congress.conf.sample to /etc/congress" -cp etc/congress.conf.sample /etc/congress/congress.conf - -echo "create congress database" -sudo mysql --user=root --password=$MYSQL_PASSWORD -e "CREATE DATABASE congress; GRANT ALL PRIVILEGES ON congress.* TO 'ubuntu@localhost' IDENTIFIED BY '"$MYSQL_PASSWORD"'; GRANT ALL PRIVILEGES ON congress.* TO 'ubuntu'@'%' IDENTIFIED BY '"$MYSQL_PASSWORD"';" - -echo "install congress-db-manage dependencies (detected by errors)" -sudo apt-get build-dep python-mysqldb -y -bin/pip install MySQL-python - -echo "create database schema" -congress-db-manage --config-file /etc/congress/congress.conf upgrade head - -echo "Install Congress client" -cd ~/git -git clone https://github.com/openstack/python-congressclient.git -cd python-congressclient -git checkout stable/liberty -../congress/bin/pip install -r requirements.txt -../congress/bin/pip install . - -function _congress_setup_horizon { - local HORIZON_DIR="/usr/share/openstack-dashboard" - local CONGRESS_HORIZON_DIR="/home/ubuntu/git/congress/contrib/horizon" - sudo cp -r $CONGRESS_HORIZON_DIR/datasources $HORIZON_DIR/openstack_dashboard/dashboards/admin/ - sudo cp -r $CONGRESS_HORIZON_DIR/policies $HORIZON_DIR/openstack_dashboard/dashboards/admin/ - sudo cp -r $CONGRESS_HORIZON_DIR/static $HORIZON_DIR/openstack_dashboard/dashboards/admin/ - sudo cp -r $CONGRESS_HORIZON_DIR/templates $HORIZON_DIR/openstack_dashboard/dashboards/admin/ - sudo cp $CONGRESS_HORIZON_DIR/congress.py $HORIZON_DIR/openstack_dashboard/api/ - sudo cp $CONGRESS_HORIZON_DIR/_50_policy.py $HORIZON_DIR/openstack_dashboard/local/enabled/ - sudo cp $CONGRESS_HORIZON_DIR/_60_policies.py $HORIZON_DIR/openstack_dashboard/local/enabled/ - sudo cp $CONGRESS_HORIZON_DIR/_70_datasources.py $HORIZON_DIR/openstack_dashboard/local/enabled/ - - # For unit tests - sudo sh -c 'echo "python-congressclient" >> '$HORIZON_DIR'/requirements.txt' - sudo sh -c 'echo -e \ -"\n# Load the pluggable dashboard settings"\ -"\nimport openstack_dashboard.local.enabled"\ -"\nfrom openstack_dashboard.utils import settings"\ -"\n\nINSTALLED_APPS = list(INSTALLED_APPS)"\ -"\nsettings.update_dashboards(["\ -"\n openstack_dashboard.local.enabled,"\ -"\n], HORIZON_CONFIG, INSTALLED_APPS)" >> '$HORIZON_DIR'/openstack_dashboard/test/settings.py' - - # Setup alias for django-admin which could be different depending on distro - local django_admin - if type -p django-admin > /dev/null; then - django_admin=django-admin - else - django_admin=django-admin.py - fi - - # Collect and compress static files (e.g., JavaScript, CSS) - DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin collectstatic --noinput - DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin compress --force - - # Restart Horizon - sudo service apache2 restart -} -# Commented out as the procedure is not yet working -#echo "Install Horizon Policy plugin" -#_congress_setup_horizon - -set +x #echo off -- cgit 1.2.3-korg