diff options
Diffstat (limited to 'ci/odl')
22 files changed, 853 insertions, 0 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh new file mode 100755 index 00000000..4d5da31d --- /dev/null +++ b/ci/odl/01-deploybundle.sh @@ -0,0 +1,19 @@ +#!/bin/bash +#placeholder for deployment script. +set -ex + +cp odl/juju-deployer/ovs-odl.yaml ./ + +echo "... Deployment Started ...." + +#case openstack kilo with odl +juju-deployer -d -r 13 -c ovs-odl.yaml trusty-kilo + +#case openstack kilo with odl ha +#juju-deployer -d -r 13 -c ovs-odl-ha.yaml trusty-kilo + +#case openstack master tip git tree with odl +#cp -R odl/juju-deployer/source/*.yaml ./ +#juju-deployer -d -r 13 -c ovs-odl-tip.yaml trusty-master-kilo + +echo "... Deployment finished ...." diff --git a/ci/odl/README b/ci/odl/README new file mode 100644 index 00000000..765e5eb7 --- /dev/null +++ b/ci/odl/README @@ -0,0 +1,87 @@ +OpenDaylight Deployment with Juju +================================= + +This readme contains instructions for checking out and deploying Juju charms for +OpenDaylight. + +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 <deployer dir> +./fetch-charms.sh + +This will checkout the relevant charms into 'src' and create any Juju symlinks +in 'charms'. + + +Deploy with cloud-sh-odl +------------------------ + +cloud-sh-odl is a collection of development shell scripts to deploy +and setup OpenStack with OpenDaylight using Juju's local provider. This will +create 3 KVMs as follows: + +*KVM #1 - Keystone, Glance, Neutron Server, Nova Cloud Controller, Horizon, + MySQL, RabbitMQ, OpenDaylight 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-odl/environments.yaml ~/.juju + (or create your own default local environment in your existing + environments.yaml file) + +cd cloud-sh-odl + +./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://<ip>/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/odl.yaml'. + +You need to 'sudo apt-get install juju-deployer' first. + +Then: + +cd juju-deployer + +juju-deployer -c odl.yaml -d trusty-icehouse-odl + +Juju Deployer will branch its own copy of the remote charms. diff --git a/ci/odl/cloud-sh-odl/cloud-setup.sh b/ci/odl/cloud-sh-odl/cloud-setup.sh new file mode 100755 index 00000000..2a0bc2a7 --- /dev/null +++ b/ci/odl/cloud-sh-odl/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/ci/odl/cloud-sh-odl/compute.sh b/ci/odl/cloud-sh-odl/compute.sh new file mode 100755 index 00000000..eb818250 --- /dev/null +++ b/ci/odl/cloud-sh-odl/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/ci/odl/cloud-sh-odl/config.sh b/ci/odl/cloud-sh-odl/config.sh new file mode 100644 index 00000000..66932c58 --- /dev/null +++ b/ci/odl/cloud-sh-odl/config.sh @@ -0,0 +1,30 @@ +export JUJU_REPOSITORY=../charms + +DEFAULT_SERIES=trusty + +CHARM_GLANCE=local:trusty/glance + +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/quantum-gateway +CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS="--config config.yaml" + +CHARM_NEUTRON_ODL=local:trusty/neutron-odl + +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_ODL_CONTROLLER=local:trusty/odl-controller + +CHARM_OPENSTACK_DASHBOARD=local:trusty/openstack-dashboard + +CHARM_RABBITMQ_SERVER=trusty/rabbitmq-server diff --git a/ci/odl/cloud-sh-odl/config.yaml b/ci/odl/cloud-sh-odl/config.yaml new file mode 100644 index 00000000..066171be --- /dev/null +++ b/ci/odl/cloud-sh-odl/config.yaml @@ -0,0 +1,18 @@ +keystone: + admin-password: password + +mysql: + dataset-size: 10% + max-connections: 1000 + +neutron-api: + neutron-plugin: odl + neutron-security-groups: True + +neutron-gateway: + instance-mtu: 1400 + plugin: odl + +nova-cloud-controller: + network-manager: Neutron + quantum-security-groups: "yes" diff --git a/ci/odl/cloud-sh-odl/deploy.sh b/ci/odl/cloud-sh-odl/deploy.sh new file mode 100755 index 00000000..b0a63b6b --- /dev/null +++ b/ci/odl/cloud-sh-odl/deploy.sh @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec ./openstack.sh ./config.sh 2>&1 | tee out.log diff --git a/ci/odl/cloud-sh-odl/environments.yaml b/ci/odl/cloud-sh-odl/environments.yaml new file mode 100644 index 00000000..72a492d3 --- /dev/null +++ b/ci/odl/cloud-sh-odl/environments.yaml @@ -0,0 +1,8 @@ +default: local + +environments: + local: + type: local + container: kvm + default-series: trusty + lxc-clone: true diff --git a/ci/odl/cloud-sh-odl/glance.sh b/ci/odl/cloud-sh-odl/glance.sh new file mode 100755 index 00000000..467932ff --- /dev/null +++ b/ci/odl/cloud-sh-odl/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/ci/odl/cloud-sh-odl/lxc-network.sh b/ci/odl/cloud-sh-odl/lxc-network.sh new file mode 100755 index 00000000..5a65fa18 --- /dev/null +++ b/ci/odl/cloud-sh-odl/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/ci/odl/cloud-sh-odl/openstack.sh b/ci/odl/cloud-sh-odl/openstack.sh new file mode 100755 index 00000000..9da2cfb5 --- /dev/null +++ b/ci/odl/cloud-sh-odl/openstack.sh @@ -0,0 +1,146 @@ +#!/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 5 + done + done +} + +waitForService() +{ + for service; do + while [ "$(agentStateUnit "$service" 0)" != started ]; do + sleep 5 + 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:-quantum-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}" +# opendaylight +juju deploy --to lxc:1 $CHARM_ODL_CONTROLLER_DEPLOY_OPTS "${CHARM_ODL_CONTROLLER:-odl-controller}" +juju deploy $CHARM_NEUTRON_ODL_DEPLOY_OPTS "${CHARM_NEUTRON_ODL:-neutron-odl}" + +# 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 + +# opendaylight +waitForService odl-controller +juju add-relation neutron-api odl-controller +juju add-relation neutron-gateway odl-controller +juju add-relation nova-compute neutron-odl +juju add-relation neutron-odl odl-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 password Admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc +chmod 0600 cloud/admin-openrc + +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/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh new file mode 100755 index 00000000..3cf269c2 --- /dev/null +++ b/ci/odl/fetch-charms.sh @@ -0,0 +1,19 @@ +#!/bin/sh -ex + +mkdir -p src/charms/trusty + +# 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:~sdn-charmers/charms/trusty/neutron-api/odl src/charms/trusty/neutron-api-odl +bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next +bzr branch lp:~sdn-charmers/charms/trusty/nova-compute/odl src/charms/trusty/nova-compute-odl +bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next +bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/odl src/charms/trusty/quantum-gateway-odl + +# opendaylight +bzr branch lp:~sdn-charmers/charms/trusty/odl-controller/trunk src/charms/trusty/odl-controller +bzr branch lp:~sdn-charmers/charms/trusty/neutron-odl/trunk src/charms/trusty/neutron-odl + +mkdir -p charms/trusty +(cd charms/trusty; ln -s ../../src/charms/trusty/* .) diff --git a/ci/odl/juju-deployer/odl.yaml b/ci/odl/juju-deployer/odl.yaml new file mode 100644 index 00000000..f5e6bd73 --- /dev/null +++ b/ci/odl/juju-deployer/odl.yaml @@ -0,0 +1,80 @@ +openstack: + services: + mysql: + constraints: mem=1G + options: + dataset-size: 50% + max-connections: 1000 + rabbitmq-server: + constraints: mem=1G + keystone: + branch: lp:~openstack-charmers/charms/trusty/keystone/next + constraints: mem=1G + openstack-dashboard: + branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next + constraints: mem=1G + nova-compute: + branch: lp:~sdn-charmers/charms/trusty/nova-compute/odl + constraints: mem=4G root-disk=20G + nova-cloud-controller: + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next + constraints: mem=1G + options: + network-manager: Neutron + neutron-api: + branch: lp:~sdn-charmers/charms/trusty/neutron-api/odl + constraints: mem=1G + neutron-gateway: + branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/odl + constraints: mem=1G + glance: + branch: lp:~openstack-charmers/charms/trusty/glance/next + constraints: mem=1G + relations: + - [ keystone, mysql ] + - [ nova-cloud-controller, mysql ] + - [ nova-cloud-controller, rabbitmq-server ] + - [ nova-cloud-controller, glance ] + - [ nova-cloud-controller, keystone ] + - [ neutron-api, mysql ] + - [ neutron-api, rabbitmq-server ] + - [ neutron-api, keystone ] + - [ neutron-api, nova-cloud-controller ] + - [ neutron-gateway, mysql ] + - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ] + - [ neutron-gateway, nova-cloud-controller ] + - [ neutron-gateway, neutron-api ] + - [ "nova-compute:shared-db", "mysql:shared-db" ] + - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] + - [ nova-compute, glance ] + - [ nova-compute, nova-cloud-controller ] + - [ glance, mysql ] + - [ glance, keystone ] + - [ openstack-dashboard, keystone ] +odl: + inherits: openstack + services: + odl-controller: + branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk + constraints: mem=4G + neutron-odl: + branch: lp:~sdn-charmers/charms/trusty/neutron-odl/trunk + relations: + - [ neutron-api, odl-controller ] + - [ neutron-gateway, odl-controller ] + - [ nova-compute, neutron-odl ] + - [ neutron-odl, odl-controller ] +trusty-icehouse-odl: + inherits: odl + series: trusty + services: + mysql: + charm: cs:trusty/mysql + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + overrides: + instance-mtu: 1400 + neutron-plugin: odl + neutron-security-groups: True + plugin: odl + quantum-security-groups: "yes" diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml new file mode 100644 index 00000000..8da98659 --- /dev/null +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -0,0 +1,101 @@ +openstack-services: + series: trusty + services: + ubuntu: + branch: "lp:charms/trusty/ubuntu" + num_utils: 1 + constraints: tags=physical + neutron-gateway: + branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl + constraints: tags=neutron + options: + plugin: ovs-odl + instance-mtu: 1400 + nova-compute: + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 2 + constraints: tags=physical + options: + enable-live-migration: False + manage-neutron-plugin-legacy-mode: False + neutron-api: + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + options: + neutron-security-groups: False + manage-neutron-plugin-legacy-mode: False + to: lxc:ubuntu=0 + neutron-api-odl: + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + options: + overlay-network-type: 'vxlan gre' + security-groups: true + odl-controller: + branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk + options: + install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + to: lxc:ubuntu=0 + openvswitch-odl: + charm: local:trusty/openvswitch-odl + mysql: + charm: cs:trusty/mysql + options: + dataset-size: 50% + max-connections: 20000 + to: lxc:ubuntu=0 + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + to: lxc:ubuntu=0 + keystone: + charm: cs:trusty/keystone + options: + admin-password: openstack + admin-token: admin + to: lxc:ubuntu=0 + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + to: lxc:ubuntu=0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller + options: + network-manager: Neutron + quantum-security-groups: "yes" + to: lxc:ubuntu=0 + glance: + charm: cs:trusty/glance + to: lxc:ubuntu=0 + relations: + - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] + - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] + - ['neutron-gateway', 'openvswitch-odl'] + - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] + - ['neutron-api-odl:odl-controller', 'odl-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-compute:cloud-compute', 'nova-cloud-controller: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'] + - ['neutron-api:shared-db', 'mysql:shared-db'] + - ['neutron-api:amqp', 'rabbitmq-server:amqp'] + - ['neutron-api:neutron-api', 'nova-cloud-controller: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'] + - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] + - ['openstack-dashboard:identity-service','keystone:identity-service'] +trusty-kilo: + inherits: openstack-services + overrides: + openstack-origin: cloud:trusty-kilo +trusty-juno: + inherits: openstack-services + overrides: + openstack-origin: cloud:trusty-juno +trusty-icehouse: + inherits: openstack-services + diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml new file mode 100644 index 00000000..f2833635 --- /dev/null +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -0,0 +1,126 @@ +openstack-services: + services: + ubuntu: + branch: "lp:charms/trusty/ubuntu" + num_utils: 1 + constraints: tags=physical + neutron-gateway: + branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl + constraints: tags=neutron + options: + plugin: ovs-odl + instance-mtu: 1400 + nova-compute: + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 2 + constraints: tags=physical + options: + enable-live-migration: False + manage-neutron-plugin-legacy-mode: False + neutron-api: + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + options: + neutron-security-groups: False + manage-neutron-plugin-legacy-mode: False + to: lxc:ubuntu=0 + neutron-api-odl: + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + options: + overlay-network-type: 'vxlan gre' + security-groups: true + odl-controller: + branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk + options: + install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + to: lxc:ubuntu=0 + openvswitch-odl: + charm: local:trusty/openvswitch-odl + mysql: + charm: cs:trusty/mysql + options: + dataset-size: 50% + max-connections: 20000 + to: lxc:ubuntu=0 + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + to: lxc:ubuntu=0 + keystone: + charm: cs:trusty/keystone + options: + admin-password: openstack + admin-token: admin + to: lxc:ubuntu=0 + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + to: lxc:ubuntu=0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller + options: + network-manager: Neutron + quantum-security-groups: "yes" + to: lxc:ubuntu=0 + glance: + charm: cs:trusty/glance + to: lxc:ubuntu=0 + relations: + - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] + - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] + - ['neutron-gateway', 'openvswitch-odl'] + - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] + - ['neutron-api-odl:odl-controller', 'odl-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-compute:cloud-compute', 'nova-cloud-controller: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'] + - ['neutron-api:shared-db', 'mysql:shared-db'] + - ['neutron-api:amqp', 'rabbitmq-server:amqp'] + - ['neutron-api:neutron-api', 'nova-cloud-controller: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'] + - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] + - ['openstack-dashboard:identity-service','keystone:identity-service'] +# master +openstack-master-git: + inherits: openstack-services + services: + keystone: + options: + openstack-origin-git: include-file://keystone-master.yaml + glance: + options: + openstack-origin-git: include-file://glance-master.yaml +# cinder: +# options: +# openstack-origin-git: include-file://cinder-master.yaml +# neutron-api: +# options: +# openstack-origin-git: include-file://neutron-master.yaml + neutron-gateway: + options: + openstack-origin-git: include-file://neutron-master.yaml +# neutron-openvswitch: +# options: +# openstack-origin-git: include-file://neutron-master.yaml + openstack-dashboard: + options: + openstack-origin-git: include-file://horizon-master.yaml + nova-compute: + options: + openstack-origin-git: include-file://nova-master.yaml + nova-cloud-controller: + options: + openstack-origin-git: include-file://nova-master.yaml +trusty-master-kilo: + inherits: openstack-master-git + series: trusty + overrides: + openstack-origin: cloud:trusty-kilo + source: cloud:trusty-kilo diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml new file mode 100644 index 00000000..8da98659 --- /dev/null +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -0,0 +1,101 @@ +openstack-services: + series: trusty + services: + ubuntu: + branch: "lp:charms/trusty/ubuntu" + num_utils: 1 + constraints: tags=physical + neutron-gateway: + branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl + constraints: tags=neutron + options: + plugin: ovs-odl + instance-mtu: 1400 + nova-compute: + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 2 + constraints: tags=physical + options: + enable-live-migration: False + manage-neutron-plugin-legacy-mode: False + neutron-api: + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + options: + neutron-security-groups: False + manage-neutron-plugin-legacy-mode: False + to: lxc:ubuntu=0 + neutron-api-odl: + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + options: + overlay-network-type: 'vxlan gre' + security-groups: true + odl-controller: + branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk + options: + install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + to: lxc:ubuntu=0 + openvswitch-odl: + charm: local:trusty/openvswitch-odl + mysql: + charm: cs:trusty/mysql + options: + dataset-size: 50% + max-connections: 20000 + to: lxc:ubuntu=0 + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + to: lxc:ubuntu=0 + keystone: + charm: cs:trusty/keystone + options: + admin-password: openstack + admin-token: admin + to: lxc:ubuntu=0 + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + to: lxc:ubuntu=0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller + options: + network-manager: Neutron + quantum-security-groups: "yes" + to: lxc:ubuntu=0 + glance: + charm: cs:trusty/glance + to: lxc:ubuntu=0 + relations: + - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] + - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] + - ['neutron-gateway', 'openvswitch-odl'] + - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] + - ['neutron-api-odl:odl-controller', 'odl-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-compute:cloud-compute', 'nova-cloud-controller: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'] + - ['neutron-api:shared-db', 'mysql:shared-db'] + - ['neutron-api:amqp', 'rabbitmq-server:amqp'] + - ['neutron-api:neutron-api', 'nova-cloud-controller: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'] + - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] + - ['openstack-dashboard:identity-service','keystone:identity-service'] +trusty-kilo: + inherits: openstack-services + overrides: + openstack-origin: cloud:trusty-kilo +trusty-juno: + inherits: openstack-services + overrides: + openstack-origin: cloud:trusty-juno +trusty-icehouse: + inherits: openstack-services + diff --git a/ci/odl/juju-deployer/source/cinder-master.yaml b/ci/odl/juju-deployer/source/cinder-master.yaml new file mode 100644 index 00000000..b000d709 --- /dev/null +++ b/ci/odl/juju-deployer/source/cinder-master.yaml @@ -0,0 +1,10 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: cinder, + repository: 'git://github.com/openstack/cinder', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 diff --git a/ci/odl/juju-deployer/source/glance-master.yaml b/ci/odl/juju-deployer/source/glance-master.yaml new file mode 100644 index 00000000..94a0622b --- /dev/null +++ b/ci/odl/juju-deployer/source/glance-master.yaml @@ -0,0 +1,10 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: glance, + repository: 'git://github.com/openstack/glance', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 diff --git a/ci/odl/juju-deployer/source/horizon-master.yaml b/ci/odl/juju-deployer/source/horizon-master.yaml new file mode 100644 index 00000000..0fd7e501 --- /dev/null +++ b/ci/odl/juju-deployer/source/horizon-master.yaml @@ -0,0 +1,10 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: horizon, + repository: 'git://github.com/openstack/horizon', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 diff --git a/ci/odl/juju-deployer/source/keystone-master.yaml b/ci/odl/juju-deployer/source/keystone-master.yaml new file mode 100644 index 00000000..fb8575de --- /dev/null +++ b/ci/odl/juju-deployer/source/keystone-master.yaml @@ -0,0 +1,10 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: keystone, + repository: 'git://github.com/openstack/keystone', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 diff --git a/ci/odl/juju-deployer/source/neutron-master.yaml b/ci/odl/juju-deployer/source/neutron-master.yaml new file mode 100644 index 00000000..ee4c8932 --- /dev/null +++ b/ci/odl/juju-deployer/source/neutron-master.yaml @@ -0,0 +1,19 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: neutron-fwaas, + repository: 'git://github.com/openstack/neutron-fwaas', + branch: master} + - {name: neutron-lbaas, + repository: 'git://github.com/openstack/neutron-lbaas', + branch: master} + - {name: neutron-vpnaas, + repository: 'git://github.com/openstack/neutron-vpnaas', + branch: master} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 diff --git a/ci/odl/juju-deployer/source/nova-master.yaml b/ci/odl/juju-deployer/source/nova-master.yaml new file mode 100644 index 00000000..0bbee4c3 --- /dev/null +++ b/ci/odl/juju-deployer/source/nova-master.yaml @@ -0,0 +1,13 @@ +repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: master} + - {name: nova, + repository: 'git://github.com/openstack/nova', + branch: master} +directory: /mnt/openstack-git +#http_proxy: http://squid.internal:3128 +#https_proxy: http://squid.internal:3128 |