From 9cedf8ac5dfbd49f1e58d3d0ca6ce7981509aed1 Mon Sep 17 00:00:00 2001 From: CNlukai Date: Tue, 12 Jan 2016 17:22:10 +0800 Subject: ONOSFW-157 Add script of installer integration onos Change-Id: Ib78b6ce38eae80f553550ad1738e678aed3950f6 Signed-off-by: CNlukai --- .../scripts/installer/joid/onos/01-deploybundle.sh | 81 +++++ framework/scripts/installer/joid/onos/README | 85 +++++ .../joid/onos/cloud-sh-onos/cloud-setup.sh | 10 + .../installer/joid/onos/cloud-sh-onos/compute.sh | 8 + .../installer/joid/onos/cloud-sh-onos/config.sh | 32 ++ .../installer/joid/onos/cloud-sh-onos/config.yaml | 21 ++ .../installer/joid/onos/cloud-sh-onos/deploy.sh | 2 + .../joid/onos/cloud-sh-onos/environments.yaml | 8 + .../installer/joid/onos/cloud-sh-onos/glance.sh | 8 + .../joid/onos/cloud-sh-onos/lxc-network.sh | 18 + .../installer/joid/onos/cloud-sh-onos/openstack.sh | 147 ++++++++ .../scripts/installer/joid/onos/fetch-charms.sh | 17 + .../installer/joid/onos/juju-deployer/onos-ha.yaml | 384 +++++++++++++++++++++ .../joid/onos/juju-deployer/onos-tip.yaml | 284 +++++++++++++++ .../installer/joid/onos/juju-deployer/onos.yaml | 297 ++++++++++++++++ .../joid/onos/juju-deployer/scripts/cloud-setup.sh | 39 +++ .../joid/onos/juju-deployer/scripts/glance.sh | 9 + .../joid/onos/juju-deployer/scripts/openstack.sh | 36 ++ .../installer/joid/onos/juju_test_prepare.sh | 59 ++++ 19 files changed, 1545 insertions(+) create mode 100644 framework/scripts/installer/joid/onos/01-deploybundle.sh create mode 100644 framework/scripts/installer/joid/onos/README create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/cloud-setup.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/compute.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/config.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/config.yaml create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/deploy.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/environments.yaml create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/glance.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/lxc-network.sh create mode 100644 framework/scripts/installer/joid/onos/cloud-sh-onos/openstack.sh create mode 100644 framework/scripts/installer/joid/onos/fetch-charms.sh create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/onos-ha.yaml create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/onos-tip.yaml create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/onos.yaml create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/scripts/cloud-setup.sh create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/scripts/glance.sh create mode 100644 framework/scripts/installer/joid/onos/juju-deployer/scripts/openstack.sh create mode 100644 framework/scripts/installer/joid/onos/juju_test_prepare.sh diff --git a/framework/scripts/installer/joid/onos/01-deploybundle.sh b/framework/scripts/installer/joid/onos/01-deploybundle.sh new file mode 100644 index 00000000..0c0af602 --- /dev/null +++ b/framework/scripts/installer/joid/onos/01-deploybundle.sh @@ -0,0 +1,81 @@ +#!/bin/bash +#placeholder for deployment script. +set -ex + +case "$1" in + 'nonha' ) + cp onos/juju-deployer/onos.yaml ./bundles.yaml + ;; + 'ha' ) + cp onos/juju-deployer/onos-ha.yaml ./bundles.yaml + ;; + 'tip' ) + cp onos/juju-deployer/onos-tip.yaml ./bundles.yaml + cp common/source/* ./ + sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml + ;; + * ) + cp onos/juju-deployer/onos.yaml ./bundles.yaml + ;; +esac + +case "$3" in + 'orangepod2' ) + # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 + sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml + # choose the correct interface to use for data network + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + ;; + 'intelpod6' ) + # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 + sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml + # choose the correct interface to use for data network + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + ;; + 'intelpod5' ) + # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 + sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml + # choose the correct interface to use for data network + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + ;; + 'attvirpod1' ) + # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 + sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + ;; + 'default' ) + sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml + # sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + ;; +esac + +echo "... Deployment Started ...." +case "$1" in + 'nonha' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" + ;; + 'ha' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" + ;; + 'tip' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" + ;; + * ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" + ;; +esac + +echo "... onos prepare test ..." + sleep 180s + sh onos/juju_test_prepare.sh \ No newline at end of file diff --git a/framework/scripts/installer/joid/onos/README b/framework/scripts/installer/joid/onos/README new file mode 100644 index 00000000..cd03022f --- /dev/null +++ b/framework/scripts/installer/joid/onos/README @@ -0,0 +1,85 @@ +ONOS Deployment with Juju +================================= + +This readme contains instructions for checking out and deploying Juju charms for +ONOS. + +The charms are targetted at Trusty. + +Checkout charms +--------------- + +Charms are hosted on Launchpad. +You need to 'sudo apt-get install bzr' first. + +Follow these steps to checkout code: + +cd +./fetch-charms.sh + +This will checkout the relevant charms into 'src' and create any Juju symlinks +in 'charms'. + +Deploy with cloud-sh-onos +------------------------ + +cloud-sh-onos is a collection of development shell scripts to deploy +and setup OpenStack with ONOS using Juju's local provider. This will +create 3 KVMs as follows: + +*KVM #1 - Keystone, Glance, Neutron Server, Nova Cloud Controller, Horizon, + MySQL, RabbitMQ, ONOS Controller + +*KVM #2 - Neutron agents + +*KVM #3 - Nova Compute + +You'll require approx. 13Gb RAM with 40Gb+ disk space. +Deployment can take anywhere between 20 mins to 1 hour. + +You need to 'sudo apt-get install juju juju-local uvtool', and +logout/login in order to pick up libvirt group permissions before +proceeding. See https://bugs.launchpad.net/juju-core/+bug/1308088. + +Follow these steps: + +ssh-keygen + (if you don't already have a key at ~/.ssh/id_rsa). + +cp cloud-sh-onos/environments.yaml ~/.juju + (or create your own default local environment in your existing + environments.yaml file) + +cd cloud-sh-onos + +./deploy.sh + +This will log to 'out.log'. + +This will deploy OpenStack and import Trusty's daily image into Glance. + +Horizon will be located on the machine 'juju status openstack-dashboard' - +http:///horizon. +Admin credentials will be written to cloud/admin-openrc. + +The deployment can be destroyed with: + +juju destroy-environment local + + +Deploy with Juju Deployer +------------------------- + +Juju Deployer can deploy a preset configuration of charms given a yaml +configuration file. There is a configuration file in +'juju-deployer/onos.yaml'. + +You need to 'sudo apt-get install juju-deployer' first. + +Then: + +cd juju-deployer + +juju-deployer -c onos.yaml -d trusty-icehouse-onos + +Juju Deployer will branch its own copy of the remote charms. diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/cloud-setup.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/cloud-setup.sh new file mode 100644 index 00000000..2a0bc2a7 --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/cloud-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh -e + +. ~/admin-openrc + +# adjust tiny image +nova flavor-delete m1.tiny +nova flavor-create m1.tiny 1 512 8 1 + +# import key pair +nova keypair-add --pub-key id_rsa.pub ubuntu-keypair diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/compute.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/compute.sh new file mode 100644 index 00000000..eb818250 --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/compute.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e + +modprobe kvm_intel +printf "\n%s\n" kvm_intel >> /etc/modules +service libvirt-bin restart + +sed -e 's/KSM_ENABLED=1/KSM_ENABLED=0/' -i /etc/default/qemu-kvm +service qemu-kvm restart diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/config.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/config.sh new file mode 100644 index 00000000..b6aed2fc --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/config.sh @@ -0,0 +1,32 @@ +export JUJU_REPOSITORY=../charms + +DEFAULT_SERIES=trusty + +CHARM_GLANCE=local:trusty/glance +CHARM_GLANCE_DEPLOY_OPTS="--config config.yaml" + +CHARM_KEYSTONE=local:trusty/keystone +CHARM_KEYSTONE_DEPLOY_OPTS="--config config.yaml" + +CHARM_MYSQL=trusty/mysql +CHARM_MYSQL_DEPLOY_OPTS="--config config.yaml" + +CHARM_NEUTRON_API=local:trusty/neutron-api +CHARM_NEUTRON_API_DEPLOY_OPTS="--config config.yaml" + +CHARM_NEUTRON_GATEWAY=local:trusty/neutron-gateway +CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS="--config config.yaml" + + +CHARM_NOVA_CLOUD_CONTROLLER=local:trusty/nova-cloud-controller +CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS="--config config.yaml" + +CHARM_NOVA_COMPUTE=local:trusty/nova-compute +CHARM_NOVA_COMPUTE_DEPLOY_OPTS="--config config.yaml" + +CHARM_ONOS_CONTROLLER=local:trusty/onos-controller + +CHARM_OPENSTACK_DASHBOARD=local:trusty/openstack-dashboard +CHARM_OPENSTACK_DASHBOARD_DEPLOY_OPTS="--config config.yaml" + +CHARM_RABBITMQ_SERVER=trusty/rabbitmq-server diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/config.yaml b/framework/scripts/installer/joid/onos/cloud-sh-onos/config.yaml new file mode 100644 index 00000000..9f90f788 --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/config.yaml @@ -0,0 +1,21 @@ +keystone: + admin-password: password + + +mysql: + dataset-size: 10% + max-connections: 1000 + +neutron-api: + neutron-plugin: onos + neutron-security-groups: True + + +neutron-gateway: + plugin: onos + + +nova-cloud-controller: + network-manager: Neutron + quantum-security-groups: "yes" + diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/deploy.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/deploy.sh new file mode 100644 index 00000000..b0a63b6b --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/deploy.sh @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec ./openstack.sh ./config.sh 2>&1 | tee out.log diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/environments.yaml b/framework/scripts/installer/joid/onos/cloud-sh-onos/environments.yaml new file mode 100644 index 00000000..72a492d3 --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/environments.yaml @@ -0,0 +1,8 @@ +default: local + +environments: + local: + type: local + container: kvm + default-series: trusty + lxc-clone: true diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/glance.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/glance.sh new file mode 100644 index 00000000..467932ff --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/glance.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e + +. ~/admin-openrc + +wget http://cloud-images.ubuntu.com/trusty/current/MD5SUMS + +wget http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img +glance image-create --name ubuntu-trusty-daily --disk-format qcow2 --container-format bare --owner admin --file trusty-server-cloudimg-amd64-disk1.img --checksum $(grep trusty-server-cloudimg-amd64-disk1.img MD5SUMS | cut -d " " -f 1) --is-public True diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/lxc-network.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/lxc-network.sh new file mode 100644 index 00000000..5a65fa18 --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/lxc-network.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e + +DEBIAN_FRONTEND=noninteractive apt-get -qy -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold install lxc < /dev/null + +sed -e 's/^USE_LXC_BRIDGE="true"/USE_LXC_BRIDGE="false"/' -i /etc/default/lxc +service lxc-net restart + +ifdown eth0 +mv /etc/network/interfaces.d/eth0.cfg /etc/network/interfaces.d/eth0.cfg.bak +cat <<-"EOF" > /etc/network/interfaces.d/bridge.cfg + auto eth0 + iface eth0 inet manual + + auto lxcbr0 + iface lxcbr0 inet dhcp + bridge_ports eth0 + EOF +ifup eth0 lxcbr0 diff --git a/framework/scripts/installer/joid/onos/cloud-sh-onos/openstack.sh b/framework/scripts/installer/joid/onos/cloud-sh-onos/openstack.sh new file mode 100644 index 00000000..b544925b --- /dev/null +++ b/framework/scripts/installer/joid/onos/cloud-sh-onos/openstack.sh @@ -0,0 +1,147 @@ +#!/bin/sh -ex + +agentState() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"machines\"][\"$1\"][\"agent-state\"]" 2> /dev/null +} + +agentStateUnit() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"agent-state\"]" 2> /dev/null +} + +configOpenrc() +{ + cat <<-EOF + export OS_USERNAME=$1 + export OS_PASSWORD=$2 + export OS_TENANT_NAME=$3 + export OS_AUTH_URL=$4 + export OS_REGION_NAME=$5 + EOF +} + +unitAddress() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null +} + +unitMachine() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null +} + +waitForMachine() +{ + for machine; do + while [ "$(agentState $machine)" != started ]; do + sleep 60 + done + done +} + +waitForService() +{ + for service; do + while [ "$(agentStateUnit "$service" 0)" != started ]; do + sleep 60 + done + done +} + +if [ $# -ne 0 ]; then + . "$1" +fi + +juju bootstrap +waitForMachine 0 + +spare_cpus=$(($(grep processor /proc/cpuinfo | wc -l) - 5)) +if [ $spare_cpus -gt 0 ]; then + spare_cpus=$(((spare_cpus * 3) / 4)) +else + spare_cpus=0 +fi + +extra_cpus=0 +[ $spare_cpus -ne 0 ] && extra_cpus=$((1 + (((spare_cpus - 1) * 3) / 4))) && spare_cpus=$((spare_cpus - extra_cpus)) +juju add-machine --constraints "cpu-cores=$((1 + extra_cpus)) mem=8G root-disk=20G" --series $DEFAULT_SERIES + +juju deploy --constraints mem=1G $CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS "${CHARM_NEUTRON_GATEWAY:-neutron-gateway}" neutron-gateway + +juju deploy --constraints "cpu-cores=$((1 + spare_cpus)) mem=4G root-disk=20G" $CHARM_NOVA_COMPUTE_DEPLOY_OPTS "${CHARM_NOVA_COMPUTE:-nova-compute}" + +waitForMachine 1 +juju scp lxc-network.sh 1: +juju run --machine 1 "sudo ./lxc-network.sh" +juju deploy --to lxc:1 $CHARM_MYSQL_DEPLOY_OPTS "${CHARM_MYSQL:-mysql}" +juju deploy --to lxc:1 $CHARM_RABBITMQ_SERVER_DEPLOY_OPTS "${CHARM_RABBITMQ_SERVER:-rabbitmq-server}" +juju deploy --to lxc:1 $CHARM_KEYSTONE_DEPLOY_OPTS "${CHARM_KEYSTONE:-keystone}" +juju deploy --to lxc:1 $CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS "${CHARM_NOVA_CLOUD_CONTROLLER:-nova-cloud-controller}" +juju deploy --to lxc:1 $CHARM_NEUTRON_API_DEPLOY_OPTS "${CHARM_NEUTRON_API:-neutron-api}" +juju deploy --to lxc:1 $CHARM_GLANCE_DEPLOY_OPTS "${CHARM_GLANCE:-glance}" +juju deploy --to lxc:1 $CHARM_OPENSTACK_DASHBOARD_DEPLOY_OPTS "${CHARM_OPENSTACK_DASHBOARD:-openstack-dashboard}" +# onos +juju deploy --to lxc:1 $CHARM_ONOS_CONTROLLER_DEPLOY_OPTS "${CHARM_ONOS_CONTROLLER:-onos-controller}" + +# relation must be set first +# no official way of knowing when this relation hook will fire +waitForService mysql keystone +juju add-relation keystone mysql +sleep 60 + +waitForService rabbitmq-server nova-cloud-controller glance +juju add-relation nova-cloud-controller mysql +juju add-relation nova-cloud-controller rabbitmq-server +juju add-relation nova-cloud-controller glance +juju add-relation nova-cloud-controller keystone +sleep 60 + +waitForService neutron-api +juju add-relation neutron-api mysql +juju add-relation neutron-api rabbitmq-server +juju add-relation neutron-api keystone +juju add-relation neutron-api nova-cloud-controller +sleep 60 + +waitForService openstack-dashboard neutron-gateway nova-compute +juju add-relation neutron-gateway mysql +juju add-relation neutron-gateway:amqp rabbitmq-server:amqp +juju add-relation neutron-gateway nova-cloud-controller +juju add-relation neutron-gateway neutron-api +juju add-relation nova-compute:shared-db mysql:shared-db +juju add-relation nova-compute:amqp rabbitmq-server:amqp +juju add-relation nova-compute glance +juju add-relation nova-compute nova-cloud-controller +juju add-relation glance mysql +juju add-relation glance keystone +juju add-relation openstack-dashboard keystone +sleep 60 + +# onos +waitForService onos-controller +juju add-relation neutron-api onos-controller +juju add-relation neutron-gateway onos-controller +juju add-relation nova-compute onos-controller +sleep 60 + +# enable kvm on compute +machine=$(unitMachine nova-compute 0) +juju scp compute.sh $machine: +juju run --machine $machine "sudo ./compute.sh" + +mkdir -m 0700 -p cloud +controller_address=$(unitAddress keystone 0) +configOpenrc admin admin Admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc +chmod 0600 cloud/admin-openrc + +# keystone need some extra time before it become availble for cloud operations. + +sleep 300 +machine=$(unitMachine nova-cloud-controller 0) +juju scp cloud-setup.sh cloud/admin-openrc ~/.ssh/id_rsa.pub $machine: +juju run --machine $machine ./cloud-setup.sh + +machine=$(unitMachine glance 0) +juju scp glance.sh cloud/admin-openrc $machine: +juju run --machine $machine ./glance.sh diff --git a/framework/scripts/installer/joid/onos/fetch-charms.sh b/framework/scripts/installer/joid/onos/fetch-charms.sh new file mode 100644 index 00000000..c5e2e2b8 --- /dev/null +++ b/framework/scripts/installer/joid/onos/fetch-charms.sh @@ -0,0 +1,17 @@ +#!/bin/sh -ex + +mkdir -p src/charms/trusty +# onos +bzr branch lp:~wuwenbin2/onosfw/onos-controller src/charms/trusty/onos-controller +bzr branch lp:~wuwenbin2/onosfw/neutron-gateway src/charms/trusty/neutron-gateway +bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos src/charms/trusty/neutron-api-onos +bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos src/charms/trusty/openvswitch-onos +# openstack +bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next +bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next +bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next +bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next + + +mkdir -p charms/trusty +(cd charms/trusty; ln -s ../../src/charms/trusty/* .) diff --git a/framework/scripts/installer/joid/onos/juju-deployer/onos-ha.yaml b/framework/scripts/installer/joid/onos/juju-deployer/onos-ha.yaml new file mode 100644 index 00000000..a1b26887 --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/onos-ha.yaml @@ -0,0 +1,384 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 3 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 2 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + "percona-cluster": + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + num_units: 3 + options: + "dataset-size": 2G + "lp1366997-workaround": true + "max-connections": 10000 + "root-password": 293rhc395m + "sst-password": 127rc14t51 + vip: 10.4.1.15 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "hacluster-keystone": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + "hacluster-horizon": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + "hacluster-nova": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' + "hacluster-neutron": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' + "hacluster-glance": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' + "hacluster-ceilometer": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + num_units: 3 + options: + vip: 10.4.1.14 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "ceilometer-agent": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" + heat: + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + to: + - "lxc:nodes-api=0" + ceph: + charm: cs:trusty/ceph + num_units: 2 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 + osd-reformat: 'no' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" + - "nodes-compute=1" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 3 + options: + use-embedded-webserver: true + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + + cinder: + charm: cs:trusty/cinder + num_units: 3 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + cinder-ceph: + charm: cs:trusty/cinder-ceph + "rabbitmq-server": + branch: lp:charms/trusty/rabbitmq-server + num_units: 3 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "keystone": + branch: lp:charms/trusty/keystone + num_units: 3 + options: +# ha-mcastport: 5402 + "admin-password": openstack + "admin-token": admin + "admin-role": admin + vip: 10.4.1.13 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "openstack-dashboard": + branch: lp:charms/trusty/openstack-dashboard + num_units: 3 + options: + secret: admin + vip: 10.4.1.11 + webroot: / + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "nova-compute": + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 2 + options: + "enable-live-migration": False + "manage-neutron-plugin-legacy-mode": False + to: + - "nodes-compute=0" + - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" + "nova-cloud-controller": + branch: lp:charms/trusty/nova-cloud-controller + num_units: 3 + options: + "console-access-protocol": novnc + "network-manager": Neutron + "quantum-security-groups": "yes" + "service-guard": true + vip: 10.4.1.16 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "neutron-api": + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + num_units: 3 + options: + neutron-security-groups: True + manage-neutron-plugin-legacy-mode: False + vip: 10.4.1.17 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + neutron-gateway: + branch: "lp:~wuwenbin2/onosfw/neutron-gateway" + options: +# "ext-port": "eth1" + plugin: onos + instance-mtu: 1400 + to: + - "nodes-api=0" + onos-controller: + branch: "lp:~wuwenbin2/onosfw/onos-controller" + to: + - "lxc:nodes-api=1" + "glance": + branch: lp:charms/trusty/glance + num_units: 3 + options: + vip: 10.4.1.12 +# ha-mcastport: 5402 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + neutron-api-onos: + branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" + options: + overlay-network-type: 'vxlan' + security-groups: True + openvswitch-onos: + branch: "lp:~wuwenbin2/onosfw/openvswitch-onos" + relations: + - - "glance:ha" + - "hacluster-glance:ha" + - - "keystone:ha" + - "hacluster-keystone:ha" + - - "neutron-api:ha" + - "hacluster-neutron:ha" + - - "nova-cloud-controller:ha" + - "hacluster-nova:ha" + - - "openstack-dashboard:ha" + - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-onos:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-onos:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-onos" + - - "openvswitch-onos:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api-onos:onos-controller" + - "onos-controller:controller-api" + - - "keystone:shared-db" + - "percona-cluster:shared-db" + - - "nova-cloud-controller:shared-db" + - "percona-cluster:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "percona-cluster:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "percona-cluster:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "percona-cluster:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "cinder:cinder-volume-service" + - "nova-cloud-controller:cinder-volume-service" + - - "cinder-ceph:storage-backend" + - "cinder:storage-backend" + - - "ceph:client" + - "nova-compute:ceph" + - - "cinder:shared-db" + - "percona-cluster:shared-db" + - - "ceph:client" + - "cinder-ceph:ceph" + - - "ceph:client" + - "glance:ceph" + - - "ceph-osd:mon" + - "ceph:osd" + - - "ceph-radosgw:mon" + - "ceph:radosgw" + - - "ceph-radosgw:identity-service" + - "keystone:identity-service" + +trusty-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + cluster_count: 3 + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 2 + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-kilo: + inherits: openstack-phase2 + overrides: + cluster_count: 3 + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-kilo" + "openstack-origin": "cloud:trusty-kilo" + series: trusty + ceph-osd-replication-count: 2 + + +trusty-juno-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-juno: + inherits: openstack-phase2 + overrides: + cluster_count: 3 + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-juno" + "openstack-origin": "cloud:trusty-juno" + series: trusty + ceph-osd-replication-count: 2 + + diff --git a/framework/scripts/installer/joid/onos/juju-deployer/onos-tip.yaml b/framework/scripts/installer/joid/onos/juju-deployer/onos-tip.yaml new file mode 100644 index 00000000..049ca08e --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/onos-tip.yaml @@ -0,0 +1,284 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + "mysql": + charm: "cs:trusty/mysql" + num_units: 1 + options: + "dataset-size": 2G + "max-connections": 10000 + to: + - "lxc:nodes-api=0" + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer-agent": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" + "heat": + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + to: + - "lxc:nodes-api=0" + ceph: + charm: cs:trusty/ceph + num_units: 1 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 + osd-reformat: 'no' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# use-embedded-webserver: true +# to: + +# - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 +# openstack-origin-git: include-file://cinder-master.yaml + to: + - "lxc:nodes-api=0" + cinder-ceph: + charm: cs:trusty/cinder-ceph + "rabbitmq-server": + branch: lp:charms/trusty/rabbitmq-server + num_units: 1 + to: + - "lxc:nodes-api=0" + "keystone": + branch: lp:charms/trusty/keystone + num_units: 1 + options: + openstack-origin-git: include-file://keystone-master.yaml + "admin-password": openstack + "admin-token": admin + "admin-role": admin + to: + - "lxc:nodes-api=0" + "openstack-dashboard": + branch: lp:charms/trusty/openstack-dashboard + num_units: 1 + options: + openstack-origin-git: include-file://horizon-master.yaml + secret: admin + to: + - "lxc:nodes-api=0" + "nova-compute": + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 1 + options: + openstack-origin-git: include-file://nova-master.yaml + "enable-live-migration": False + "manage-neutron-plugin-legacy-mode": False + to: + - "nodes-compute=0" +# - "nodes-compute=1" + "nova-cloud-controller": + branch: lp:charms/trusty/nova-cloud-controller + num_units: 1 + options: + openstack-origin-git: include-file://nova-master.yaml + "console-access-protocol": novnc + "network-manager": Neutron + "quantum-security-groups": "yes" + to: + - "lxc:nodes-api=0" + "neutron-api": + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + num_units: 1 + options: + neutron-security-groups: True + manage-neutron-plugin-legacy-mode: False + to: + - "lxc:nodes-api=0" + neutron-gateway: + branch: "lp:~wuwenbin2/onosfw/neutron-gateway" + options: + openstack-origin-git: include-file://neutron-master.yaml +# "ext-port": "eth1" + plugin: ovs-onos + instance-mtu: 1400 + to: + - "nodes-api=0" + onos-controller: + branch: "lp:~wuwenbin2/onosfw/onos-controller" + to: + - "lxc:nodes-api=0" + "glance": + branch: lp:charms/trusty/glance + num_units: 1 + options: + openstack-origin-git: include-file://glance-master.yaml + to: + - "lxc:nodes-api=0" + neutron-api-onos: + branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" + options: + overlay-network-type: 'vxlan' + security-groups: True + openvswitch-onos: + branch: "lp:~wuwenbin2/onosfw/openvswitch-onos" + relations: + - - "nova-compute:neutron-plugin" + - "neutron-api:neutron-plugin" + - - "neutron-gateway" + - "onos-controller:ovsdb-manager" + - - "nova-compute:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api:onos-controller" + - "onos-controller:controller-api" + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "cinder:cinder-volume-service" + - "nova-cloud-controller:cinder-volume-service" + - - "cinder-ceph:storage-backend" + - "cinder:storage-backend" + - - "ceph:client" + - "nova-compute:ceph" + - - "cinder:shared-db" + - "mysql:shared-db" + - - "ceph:client" + - "cinder-ceph:ceph" + - - "ceph:client" + - "glance:ceph" +trusty-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 1 + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +# master +trusty-kilo: + inherits: openstack-phase2 + series: trusty + overrides: + region: Canonical + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + openstack-origin: cloud:trusty-kilo + source: cloud:trusty-kilo + series: trusty + ceph-osd-replication-count: 1 + + diff --git a/framework/scripts/installer/joid/onos/juju-deployer/onos.yaml b/framework/scripts/installer/joid/onos/juju-deployer/onos.yaml new file mode 100644 index 00000000..44638d2f --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/onos.yaml @@ -0,0 +1,297 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + "mysql": + charm: "cs:trusty/mysql" + num_units: 1 + options: + "dataset-size": 2G + "max-connections": 10000 + to: + - "lxc:nodes-api=0" + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer-agent": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" + heat: + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + to: + - "lxc:nodes-api=0" + ceph: + charm: cs:trusty/ceph + num_units: 1 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 + osd-reformat: 'no' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# use-embedded-webserver: true +# to: +# - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 + to: + - "lxc:nodes-api=0" + cinder-ceph: + charm: cs:trusty/cinder-ceph + "rabbitmq-server": + branch: lp:charms/trusty/rabbitmq-server + num_units: 1 + to: + - "lxc:nodes-api=0" + "keystone": + branch: lp:charms/trusty/keystone + num_units: 1 + options: +# ha-mcastport: 5402 + "admin-password": openstack + "admin-token": admin + "admin-role": admin + to: + - "lxc:nodes-api=0" + "openstack-dashboard": + branch: lp:charms/trusty/openstack-dashboard + num_units: 1 + options: + secret: admin + webroot: / + to: + - "lxc:nodes-api=0" + "nova-compute": + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 1 + options: + "enable-live-migration": False + "manage-neutron-plugin-legacy-mode": False + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" + "nova-cloud-controller": + branch: lp:charms/trusty/nova-cloud-controller + num_units: 1 + options: + "console-access-protocol": novnc + "network-manager": Neutron + "quantum-security-groups": "yes" + to: + - "lxc:nodes-api=0" + "neutron-api": + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + num_units: 1 + options: + neutron-security-groups: True + manage-neutron-plugin-legacy-mode: False + to: + - "lxc:nodes-api=0" + neutron-gateway: + branch: "lp:~wuwenbin2/onosfw/neutron-gateway" + options: +# "ext-port": "eth1" + plugin: onos + instance-mtu: 1400 + to: + - "nodes-api=0" + onos-controller: + branch: "lp:~wuwenbin2/onosfw/onos-controller" + to: + - "lxc:nodes-api=0" + "glance": + branch: lp:charms/trusty/glance + num_units: 1 + to: + - "lxc:nodes-api=0" + neutron-api-onos: + branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" + options: + overlay-network-type: 'vxlan' + security-groups: True + openvswitch-onos: + branch: "lp:~wuwenbin2/onosfw/openvswitch-onos" + relations: + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-onos:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-onos:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-onos" + - - "openvswitch-onos:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api-onos:onos-controller" + - "onos-controller:controller-api" + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "cinder:cinder-volume-service" + - "nova-cloud-controller:cinder-volume-service" + - - "cinder-ceph:storage-backend" + - "cinder:storage-backend" + - - "ceph:client" + - "nova-compute:ceph" + - - "cinder:shared-db" + - "mysql:shared-db" + - - "ceph:client" + - "cinder-ceph:ceph" + - - "ceph:client" + - "glance:ceph" +trusty-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 1 + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-kilo: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-kilo" + "openstack-origin": "cloud:trusty-kilo" + series: trusty + ceph-osd-replication-count: 1 + + +trusty-juno-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-juno: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-juno" + "openstack-origin": "cloud:trusty-juno" + series: trusty + ceph-osd-replication-count: 1 + + diff --git a/framework/scripts/installer/joid/onos/juju-deployer/scripts/cloud-setup.sh b/framework/scripts/installer/joid/onos/juju-deployer/scripts/cloud-setup.sh new file mode 100644 index 00000000..184cecc6 --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/scripts/cloud-setup.sh @@ -0,0 +1,39 @@ +#!/bin/sh -e + +. ~/admin-openrc + +# adjust tiny image +nova flavor-delete m1.tiny +nova flavor-create m1.tiny 1 512 8 1 + +# configure security groups +neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default +neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default + +# import key pair +keystone tenant-create --name demo --description "Demo Tenant" +keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo + +nova keypair-add --pub-key id_rsa.pub ubuntu-keypair + +# configure external network +neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat +neutron subnet-create ext-net --name ext-subnet --allocation-pool start=10.5.8.5,end=10.5.8.254 --disable-dhcp --gateway 10.5.8.1 10.5.8.0/24 + +# create vm network +neutron net-create demo-net +neutron subnet-create --name demo-subnet --gateway 10.20.5.1 demo-net 10.20.5.0/24 + +neutron router-create demo-router + +neutron router-interface-add demo-router demo-subnet + +neutron router-gateway-set demo-router ext-net + +# create pool of floating ips +i=0 +while [ $i -ne 10 ]; do + neutron floatingip-create ext-net + i=$((i + 1)) +done + diff --git a/framework/scripts/installer/joid/onos/juju-deployer/scripts/glance.sh b/framework/scripts/installer/joid/onos/juju-deployer/scripts/glance.sh new file mode 100644 index 00000000..a18afe6c --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/scripts/glance.sh @@ -0,0 +1,9 @@ +#!/bin/sh -e + +. ~/admin-openrc + +wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img +wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img +glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --progress +glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress +rm -rf /tmp/images diff --git a/framework/scripts/installer/joid/onos/juju-deployer/scripts/openstack.sh b/framework/scripts/installer/joid/onos/juju-deployer/scripts/openstack.sh new file mode 100644 index 00000000..e12ebbfd --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju-deployer/scripts/openstack.sh @@ -0,0 +1,36 @@ +#!/bin/sh -ex + +configOpenrc() +{ + cat <<-EOF + export OS_USERNAME=$1 + export OS_PASSWORD=$2 + export OS_TENANT_NAME=$3 + export OS_AUTH_URL=$4 + export OS_REGION_NAME=$5 + EOF +} + +unitAddress() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null +} + +unitMachine() +{ + juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null +} + +mkdir -m 0700 -p cloud +controller_address=$(unitAddress keystone 0) +configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc +chmod 0600 cloud/admin-openrc + +machine=$(unitMachine glance 0) +juju scp glance.sh cloud/admin-openrc $machine: +juju run --machine $machine ./glance.sh + +machine=$(unitMachine nova-cloud-controller 0) +juju scp cloud-setup.sh cloud/admin-openrc ~/.ssh/id_rsa.pub $machine: +juju run --machine $machine ./cloud-setup.sh + diff --git a/framework/scripts/installer/joid/onos/juju_test_prepare.sh b/framework/scripts/installer/joid/onos/juju_test_prepare.sh new file mode 100644 index 00000000..9080e1ed --- /dev/null +++ b/framework/scripts/installer/joid/onos/juju_test_prepare.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +# launch eht1 on computer nodes and remove default gw route +# Update gateway mac to onos for l3 function + +# author: York(Yuanyou) + +GW_IP=$(maas maas networks read | grep default_gateway | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}') + +CIDR=$(maas maas networks read | grep description | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}/24') + +# launch eht1 on computer nodes and remove default gw route +launch_eth1() { + computer_list=$(juju status --format short | grep -Eo 'nova-compute/[0-9]') + for node in $computer_list; do + echo "node name is ${node}" + juju ssh $node "sudo ifconfig eth1 up" + juju ssh $node "sudo route del default gw $GW_IP" + done +} + +# create external network and subnet in openstack +create_ext_network() { + keystoneIp=$(juju status --format short | grep keystone/0 | grep -v ha | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}') + configOpenrc admin openstack admin http://$keystoneIp:5000/v2.0 Canonical + juju scp ./admin-openrc nova-cloud-controller/0: + juju ssh nova-cloud-controller/0 "source admin-openrc;neutron net-create ext-net --shared --router:external=True;neutron subnet-create ext-net --name ext-subnet $CIDR" +} + +configOpenrc() +{ + echo " " > ./admin-openrc + echo "export OS_USERNAME=$1" >> ./admin-openrc + echo "export OS_PASSWORD=$2" >> ./admin-openrc + echo "export OS_TENANT_NAME=$3" >> ./admin-openrc + echo "export OS_AUTH_URL=$4" >> ./admin-openrc + echo "export OS_REGION_NAME=$5" >> ./admin-openrc + } + +# Update gateway mac to onos for l3 function +update_gw_mac() { + ## get gateway mac + GW_MAC=$(juju ssh nova-compute/0 "arp -a ${GW_IP} | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})'") + ## set external gateway mac in onos + cmd="/opt/onos/bin/onos \'externalgateway-update -m $GW_MAC\'" + juju ssh onos-controller/0 "echo $cmd > update_mac.sh" + ## delete the ^M + juju ssh onos-controller/0 "cat -v update_mac.sh |tr -d "^M" > update_mac1.sh" + juju ssh onos-controller/0 "sh update_mac1.sh" + +} + +main() { + launch_eth1 + create_ext_network + update_gw_mac +} + +main "$@" -- cgit 1.2.3-korg