diff options
23 files changed, 741 insertions, 360 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 8ac8101b..882218cd 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -54,6 +54,10 @@ case "$3" in sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.1202"/g' ./bundles.yaml ;; + 'juniperpod1' ) + sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml + 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 @@ -69,20 +73,27 @@ esac echo "... Deployment Started ...." case "$1" in 'nonha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -t 3600 -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 3600 -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 3600 -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 3600 -c bundles.yaml trusty-"$2"-nodes juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; esac +case "$4" in + 'onos' ) + echo "... onos prepare test ..." + sleep 180s + sh onos/juju_test_prepare.sh "$3" + ;; +esac diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index e7155c26..72c2c615 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -25,17 +25,24 @@ case "$1" in ;; * ) virtinstall=1 + ./cleanvm.sh cp maas/default/deployment.yaml ./deployment.yaml ;; esac +#just make sure the ssh keys added into maas for the current user +sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml +sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml + #make sure no password asked during the deployment. echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init if [ -e /etc/sudoers.d/90-joid-init ]; then sudo cp /etc/sudoers.d/90-joid-init 91-joid-init - cat 90-joid-init >> 91-joid-init + sudo chown $USER:$USER 91-joid-init + sudo chmod 660 91-joid-init + sudo cat 90-joid-init >> 91-joid-init sudo chown root:root 91-joid-init sudo mv 91-joid-init /etc/sudoers.d/ else @@ -52,7 +59,7 @@ fi if [ ! -e /var/lib/libvirt/images ]; then sudo apt-get install libvirt-bin -y - sudo adduser ubuntu libvirtd + sudo adduser $USER libvirtd sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ sudo virsh pool-start default sudo virsh pool-autostart default @@ -132,9 +139,12 @@ apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/" #maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*" -maas maas boot-resources import +maas maas node-groups import-boot-images maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`" +#Added the Qtip public to run the Qtip test after install on bare metal nodes. +maas maas sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`" + #adding compute and control nodes VM to MAAS for deployment purpose. if [ "$virtinstall" -eq 1 ]; then # create two more VMs to do the deployment. @@ -179,9 +189,9 @@ case "$1" in ;; 'orangepod2' ) maas refresh - enableautomodebyname eth1 DHCP "192.168.2.0/24" compute || true + enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true - enableautomodebyname eth1 DHCP "192.168.2.0/24" control || true + enableautomodebyname eth2 DHCP "192.168.22.0/24" control || true enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true ;; 'attvirpod1' ) diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh index d3345172..5277bf40 100644..100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh @@ -8,20 +8,20 @@ set -ex echo " Cleanup Started ..." ./clean.sh - virsh destroy opnfv-maas || true - virsh destroy bootstrap || true - virsh destroy node1-control || true - virsh destroy node3-control || true - virsh destroy node4-control || true - virsh destroy node2-compute || true - virsh destroy node5-compute || true - virsh undefine opnfv-maas || true - virsh undefine bootstrap || true - virsh undefine node1-control || true - virsh undefine node3-control || true - virsh undefine node4-control || true - virsh undefine node2-compute || true - virsh undefine node5-compute || true - sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true +sudo virsh destroy opnfv-maas || true +sudo virsh destroy bootstrap || true +sudo virsh destroy node1-control || true +sudo virsh destroy node3-control || true +sudo virsh destroy node4-control || true +sudo virsh destroy node2-compute || true +sudo virsh destroy node5-compute || true +sudo virsh undefine opnfv-maas || true +sudo virsh undefine bootstrap || true +sudo virsh undefine node1-control || true +sudo virsh undefine node3-control || true +sudo virsh undefine node4-control || true +sudo virsh undefine node2-compute || true +sudo virsh undefine node5-compute || true +sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true echo " Cleanup Finished ..." diff --git a/ci/deployment.yaml b/ci/deployment.yaml index d0c9e6c4..8ebfd5aa 100755..100644 --- a/ci/deployment.yaml +++ b/ci/deployment.yaml @@ -11,8 +11,8 @@ demo-maas: arch: amd64 pool: default disk_size: 20G - sticky_ip_address: - requested_address: 192.168.122.5 +# sticky_ip_address: +# requested_address: 192.168.122.25 maas: # Defines the general setup for the MAAS environment, including the @@ -36,7 +36,7 @@ demo-maas: # Package sources. These will be used on the MAAS controller. apt_sources: - - ppa:maas/stable + - ppa:maas/next - ppa:juju/stable # Virsh power settings @@ -110,11 +110,11 @@ demo-maas: broadcast_ip: 192.168.122.255 router_ip: 192.168.122.1 static_range: - low: 192.168.122.51 - high: 192.168.122.60 + low: 192.168.122.101 + high: 192.168.122.200 dynamic_range: - low: 192.168.122.5 - high: 192.168.122.50 + low: 192.168.122.25 + high: 192.168.122.100 # Physical nodes to be added to the MAAS cluster. Nodes will be # configured, commissioned and put into the Ready state so diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml index 90b284b9..8ebfd5aa 100644 --- a/ci/maas/default/deployment.yaml +++ b/ci/maas/default/deployment.yaml @@ -11,8 +11,8 @@ demo-maas: arch: amd64 pool: default disk_size: 20G - sticky_ip_address: - requested_address: 192.168.122.25 +# sticky_ip_address: +# requested_address: 192.168.122.25 maas: # Defines the general setup for the MAAS environment, including the diff --git a/ci/maas/sshkeys/QtipKey.pub b/ci/maas/sshkeys/QtipKey.pub new file mode 100644 index 00000000..dc93faa0 --- /dev/null +++ b/ci/maas/sshkeys/QtipKey.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFWkAL5DwtPJ+0BMKBUcgq8ORdjMcj/wJl4qVVYeUdQDT/oS6pKuHNuk7BJpCLYLfHgSzO+Hv8J+5UyqXXXJKGxfAUPtpXrHRgburwhRJwcgtQVqWbQXHnY2jsikHeWWW5RX6SHxrLrxX04a8xmtD7BbDiJ6HZqVSem8XC15eZvw1C1dbqmbZqWBRWLFzhHf/9goucaSP3ekYWVCUPPlDS+D7r2Mc2Ch0Z7AivEJZ5mTamefS80B1ZNBRObvP/W5jPoAh5H9bHrqayZyEVGaYOk/toddJJAQHJIXu/8YSxnUnC0FbTtZ5s2JO/3Big5/IpW5m5NsHCOqVPjHkKkgkT diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 4740a676..f22bd535 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -21,40 +21,40 @@ openstack-phase2: inherits: openstack-phase1 services: ceilometer: - charm: cs:trusty/ceilometer + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" num_units: 3 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" ceilometer-agent: - charm: cs:trusty/ceilometer-agent + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" ceph: - charm: cs:trusty/ceph - num_units: 2 + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + num_units: 3 options: - monitor-count: 1 + monitor-count: 3 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - osd-reformat: 'yes' + osd-devices: "" +# osd-reformat: 'yes' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "nodes-compute=0" - - "nodes-compute=1" + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" ceph-osd: - charm: cs:trusty/ceph-osd - num_units: 3 + branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" + num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" + - "nodes-compute=0" + - "nodes-compute=1" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 options: use-embedded-webserver: true @@ -62,7 +62,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder: - charm: cs:trusty/cinder + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 3 options: block-device: None @@ -73,10 +73,10 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" num_units: 0 glance: - charm: cs:trusty/glance + branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 3 options: ha-mcastport: 5402 @@ -91,7 +91,7 @@ openstack-phase2: to: - "lxc:nodes-api=2" keystone: - charm: cs:trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 3 options: admin-password: openstack @@ -121,7 +121,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api: - charm: cs:trusty/neutron-api + branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next" num_units: 3 options: neutron-security-groups: true @@ -131,7 +131,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" neutron-gateway: - charm: cs:trusty/neutron-gateway + branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" num_units: 1 options: # "ext-port": "eth1" @@ -139,10 +139,10 @@ openstack-phase2: to: - "nodes-api=0" neutron-openvswitch: - charm: cs:trusty/neutron-openvswitch + branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" num_units: 0 nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 3 options: network-manager: Neutron @@ -154,7 +154,7 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=2" nova-compute: - charm: cs:trusty/nova-compute + branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next" num_units: 2 options: enable-live-migration: true @@ -168,7 +168,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" openstack-dashboard: - charm: cs:trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 3 options: secret: admin @@ -179,38 +179,38 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" rabbitmq-server: - charm: cs:trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 3 to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" heat: - charm: cs:trusty/heat + branch: "lp:~openstack-charmers/charms/trusty/heat/next" to: - "lxc:nodes-api=0" hacluster-keystone: - charm: cs:trusty/hacluster + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' hacluster-horizon: - charm: cs:trusty/hacluster + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' hacluster-nova: - charm: cs:trusty/hacluster + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' hacluster-neutron: - charm: cs:trusty/hacluster + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' hacluster-glance: - charm: cs:trusty/hacluster + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' @@ -324,6 +324,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -342,6 +343,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -360,6 +362,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 85cf997c..3be7e824 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -21,35 +21,35 @@ openstack-phase2: inherits: openstack-phase1 services: ceilometer: - charm: cs:trusty/ceilometer + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" num_units: 1 to: - "lxc:nodes-api=0" ceilometer-agent: - charm: cs:trusty/ceilometer-agent + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" num_units: 1 options: monitor-count: 1 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - osd-reformat: 'yes' + osd-devices: "" +# osd-reformat: 'yes' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "nodes-compute=0" + - "lxc:nodes-api=0" ceph-osd: - charm: cs:trusty/ceph-osd + branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" + - "nodes-compute=0" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 options: use-embedded-webserver: true @@ -57,7 +57,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder: - charm: cs:trusty/cinder + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -66,10 +66,10 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" num_units: 0 glance: - charm: cs:trusty/glance + branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 1 options: ha-mcastport: 5402 @@ -81,7 +81,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" keystone: - charm: cs:trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 options: admin-password: openstack @@ -102,14 +102,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-api: - charm: cs:trusty/neutron-api + branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next" num_units: 1 options: neutron-security-groups: true to: - "lxc:nodes-api=0" neutron-gateway: - charm: cs:trusty/neutron-gateway + branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" num_units: 1 options: instance-mtu: 1400 @@ -117,10 +117,10 @@ openstack-phase2: to: - "nodes-api=0" neutron-openvswitch: - charm: cs:trusty/neutron-openvswitch + branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" num_units: 0 nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 1 options: network-manager: Neutron @@ -128,7 +128,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" nova-compute: - charm: cs:trusty/nova-compute + branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next" num_units: 1 options: enable-live-migration: true @@ -142,7 +142,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" openstack-dashboard: - charm: cs:trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: secret: admin @@ -150,12 +150,12 @@ openstack-phase2: to: - "lxc:nodes-api=0" rabbitmq-server: - charm: cs:trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" heat: - charm: cs:trusty/heat + branch: "lp:~openstack-charmers/charms/trusty/heat/next" to: - "lxc:nodes-api=0" relations: @@ -258,6 +258,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -276,6 +277,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -294,6 +296,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 98d7ba7a..75f3cafd 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "mysql": - charm: "cs:trusty/mysql" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: "dataset-size": 2G @@ -45,37 +45,35 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" num_units: 1 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -85,14 +83,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" "keystone": - branch: lp:charms/trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 options: openstack-origin-git: include-file://keystone-master.yaml @@ -101,7 +99,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: openstack-origin-git: include-file://horizon-master.yaml @@ -119,7 +117,7 @@ openstack-phase2: - "nodes-compute=0" # - "nodes-compute=1" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 1 options: openstack-origin-git: include-file://nova-master.yaml @@ -137,7 +135,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" options: openstack-origin-git: include-file://neutron-master.yaml instance-mtu: 1400 @@ -145,7 +143,7 @@ openstack-phase2: to: - "nodes-api=0" "glance": - branch: lp:charms/trusty/glance + branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 1 options: openstack-origin-git: include-file://glance-master.yaml @@ -157,7 +155,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-openvswitch: - branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk + branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" options: openstack-origin-git: include-file://neutron-master.yaml relations: @@ -241,6 +239,12 @@ openstack-phase2: - "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: @@ -250,6 +254,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -271,6 +276,7 @@ trusty-kilo: overrides: region: Canonical #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo diff --git a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh index 184cecc6..de0dd764 100755 --- a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh +++ b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh @@ -17,7 +17,7 @@ keystone user-create --name demo --tenant demo --pass demo --email demo@demo.dem 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 net-create ext-net --router:external --provider:physical_network external --provider:network_type flat --shared 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 diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 4860799e..b46be986 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -10,20 +10,20 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - "ntp": + "ntp": charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" - - "ntp:juju-info" - "nodes-compute:juju-info" -openstack-phase2: +openstack-phase2: inherits: openstack-phase1 - services: - "percona-cluster": + services: + "percona-cluster": branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 - options: + options: "dataset-size": 2G "lp1366997-workaround": true "max-connections": 10000 @@ -49,7 +49,7 @@ openstack-phase2: options: corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' - "hacluster-neutron": + "hacluster-neutron": branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | @@ -86,26 +86,29 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: branch: lp:~openstack-charmers/charms/trusty/ceph/next - num_units: 2 + num_units: 3 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - monitor-count: 1 - osd-reformat: 'false' + osd-devices: "" + monitor-count: 3 +# osd-reformat: 'false' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "nodes-compute=0" - - "nodes-compute=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" ceph-osd: branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next - num_units: 1 + num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=1" + - "nodes-compute=0" + - "nodes-compute=1" +# - "nodes-api=0" ceph-radosgw: branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next num_units: 1 @@ -127,17 +130,17 @@ openstack-phase2: - "lxc:nodes-api=2" cinder-ceph: branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next - "rabbitmq-server": + "rabbitmq-server": branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next num_units: 3 to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "keystone": + "keystone": branch: lp:~openstack-charmers/charms/trusty/keystone/next num_units: 3 - options: + options: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin @@ -146,10 +149,10 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "openstack-dashboard": + "openstack-dashboard": branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next num_units: 3 - options: + options: secret: admin vip: 10.4.1.11 webroot: / @@ -157,10 +160,10 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - "nova-compute": + "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next num_units: 2 - options: + options: "enable-live-migration": False "manage-neutron-plugin-legacy-mode": False to: @@ -169,27 +172,28 @@ openstack-phase2: # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" - "nova-cloud-controller": + "nova-cloud-controller": branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next num_units: 3 - options: + options: "console-access-protocol": novnc "network-manager": Neutron "quantum-security-groups": "yes" "service-guard": true + "neutron-external-network": ext_net vip: 10.4.1.16 to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "neutron-api": + "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: + to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" @@ -199,22 +203,22 @@ openstack-phase2: # "ext-port": "eth1" plugin: ovs-odl instance-mtu: 1400 - to: + to: - "nodes-api=0" odl-controller: branch: lp:~openstack-charmers/charms/trusty/odl-controller/next options: - install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" -# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz" + #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz" + profile: "openvswitch-odl-lithium" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" - - to: + to: - "lxc:nodes-api=1" - "glance": + "glance": branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 - options: + options: vip: 10.4.1.12 # ha-mcastport: 5402 to: @@ -227,7 +231,7 @@ openstack-phase2: to: - "lxc:nodes-api=2" neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next options: overlay-network-type: 'vxlan gre' security-groups: True @@ -347,6 +351,7 @@ trusty-liberty: overrides: # cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -366,6 +371,7 @@ trusty-kilo: overrides: # cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -385,6 +391,7 @@ trusty-juno: overrides: # cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" @@ -393,4 +400,3 @@ trusty-juno: ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin - diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 3511c929..d4c398de 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "mysql": - charm: "cs:trusty/mysql" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: "dataset-size": 2G @@ -45,36 +45,35 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" num_units: 1 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -83,14 +82,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" "keystone": - branch: lp:charms/trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 options: # ha-mcastport: 5402 @@ -99,7 +98,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: secret: admin @@ -119,7 +118,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next num_units: 1 options: "console-access-protocol": novnc @@ -136,7 +135,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: # "ext-port": "eth1" plugin: ovs-odl @@ -146,15 +145,15 @@ openstack-phase2: odl-controller: branch: lp:~openstack-charmers/charms/trusty/odl-controller/next options: - install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" - #install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz" + #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz" + profile: "openvswitch-odl-lithium" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" - - to: + to: - "lxc:nodes-api=0" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 to: - "lxc:nodes-api=0" @@ -255,6 +254,12 @@ openstack-phase2: - "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: @@ -264,6 +269,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -282,6 +288,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -300,6 +307,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 341f59ac..2d83b60d 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "mysql": - charm: "cs:trusty/mysql" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: "dataset-size": 2G @@ -45,37 +45,35 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" num_units: 1 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -85,14 +83,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next num_units: 1 to: - "lxc:nodes-api=0" "keystone": - branch: lp:charms/trusty/keystone + branch: lp:~openstack-charmers/charms/trusty/keystone/next num_units: 1 options: openstack-origin-git: include-file://keystone-master.yaml @@ -101,7 +99,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next num_units: 1 options: openstack-origin-git: include-file://horizon-master.yaml @@ -119,7 +117,7 @@ openstack-phase2: - "nodes-compute=0" # - "nodes-compute=1" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next num_units: 1 options: openstack-origin-git: include-file://nova-master.yaml @@ -137,7 +135,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: openstack-origin-git: include-file://neutron-master.yaml # "ext-port": "eth1" @@ -148,14 +146,15 @@ openstack-phase2: odl-controller: branch: lp:~openstack-charmers/charms/trusty/odl-controller/next options: - install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" -# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz" + #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" + install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz" + profile: "openvswitch-odl-lithium" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" to: - - "lxc:nodes-api=0" + - "lxc:nodes-api=1" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 options: openstack-origin-git: include-file://glance-master.yaml @@ -258,6 +257,12 @@ openstack-phase2: - "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: @@ -267,6 +272,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -288,6 +294,7 @@ trusty-kilo: overrides: region: Canonical #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh index 85a5ff98..60935ad4 100644 --- a/ci/onos/01-deploybundle.sh +++ b/ci/onos/01-deploybundle.sh @@ -4,18 +4,18 @@ set -ex case "$1" in 'nonha' ) - cp onos/juju-deployer/onos.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml ;; 'ha' ) - cp onos/juju-deployer/onos-ha.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-onos-ha.yaml ./bundles.yaml ;; 'tip' ) - cp onos/juju-deployer/onos-tip.yaml ./bundles.yaml + cp onos/juju-deployer/ovs-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 + cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml ;; esac @@ -76,3 +76,6 @@ case "$1" in ;; esac +echo "... onos prepare test ..." + sleep 180s + sh onos/juju_test_prepare.sh "$3"
\ No newline at end of file diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 77e42013..56304ac3 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -35,32 +35,32 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" "hacluster-keystone": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' "hacluster-horizon": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' "hacluster-nova": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' "hacluster-neutron": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' "hacluster-glance": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' "hacluster-ceilometer": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' @@ -85,29 +85,31 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph - num_units: 2 + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + num_units: 3 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - monitor-count: 1 - osd-reformat: 'no' + osd-devices: "" + monitor-count: 3 +# 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" + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" ceph-osd: - charm: cs:trusty/ceph-osd - num_units: 1 + branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" + num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" + - "nodes-compute=0" + - "nodes-compute=1" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 3 options: use-embedded-webserver: true @@ -118,7 +120,7 @@ openstack-phase2: - "lxc:nodes-api=2" cinder: - charm: cs:trusty/cinder + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 3 options: block-device: None @@ -129,16 +131,16 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 3 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" "keystone": - branch: lp:charms/trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 3 options: # ha-mcastport: 5402 @@ -150,7 +152,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 3 options: secret: admin @@ -173,7 +175,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 3 options: "console-access-protocol": novnc @@ -209,7 +211,7 @@ openstack-phase2: to: - "lxc:nodes-api=1" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 options: vip: 10.4.1.12 @@ -344,6 +346,7 @@ trusty-liberty: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -363,6 +366,7 @@ trusty-kilo: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -382,6 +386,7 @@ trusty-juno: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 28983bbe..e2a7e3b0 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "mysql": - charm: "cs:trusty/mysql" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: "dataset-size": 2G @@ -45,36 +45,35 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceph/next" num_units: 1 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -83,14 +82,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" "keystone": - branch: lp:charms/trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 options: # ha-mcastport: 5402 @@ -99,7 +98,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: secret: admin @@ -119,7 +118,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 1 options: "console-access-protocol": novnc @@ -148,7 +147,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 to: - "lxc:nodes-api=0" @@ -249,6 +248,12 @@ openstack-phase2: - "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: @@ -258,6 +263,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -276,6 +282,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -294,6 +301,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 11ff4717..1e173d18 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "mysql": - charm: "cs:trusty/mysql" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: "dataset-size": 2G @@ -45,37 +45,35 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" num_units: 1 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 + branch: "lp:~openstack-charmers/charms/trusty/cinder/next" num_units: 1 options: block-device: None @@ -85,14 +83,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" "keystone": - branch: lp:charms/trusty/keystone + branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 options: openstack-origin-git: include-file://keystone-master.yaml @@ -101,7 +99,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: openstack-origin-git: include-file://horizon-master.yaml @@ -119,7 +117,7 @@ openstack-phase2: - "nodes-compute=0" # - "nodes-compute=1" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 1 options: openstack-origin-git: include-file://nova-master.yaml @@ -141,7 +139,7 @@ openstack-phase2: options: openstack-origin-git: include-file://neutron-master.yaml # "ext-port": "eth1" - plugin: ovs-onos + plugin: onos instance-mtu: 1400 to: - "nodes-api=0" @@ -150,7 +148,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" "glance": - branch: lp:charms/trusty/glance + branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 1 options: openstack-origin-git: include-file://glance-master.yaml @@ -251,6 +249,12 @@ openstack-phase2: - "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: @@ -260,6 +264,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" @@ -281,6 +286,7 @@ trusty-kilo: overrides: region: Canonical #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo diff --git a/ci/onos/juju_test_prepare.sh b/ci/onos/juju_test_prepare.sh new file mode 100644 index 00000000..60b51a72 --- /dev/null +++ b/ci/onos/juju_test_prepare.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# launch eth on computer nodes and remove default gw route +# Update gateway mac to onos for l3 function + +# author: York(Yuanyou) +# set the gateway ip and cidr and compute-node eth name. +case "$1" in + 'orangepod2' ) + GW_IP=192.168.22.1 + CIDR=192.168.22.0/24 + COMPUTE_ETH=eth1 + ;; + 'intelpod6' ) + GW_IP=10.2.66.1 + CIDR=10.2.66.0/24 + COMPUTE_ETH=eth2 + ;; + 'intelpod5' ) + GW_IP=10.2.65.1 + CIDR=10.2.65.0/24 + COMPUTE_ETH=eth2.724 + ;; + 'attvirpod1' ) + GW_IP=10.10.15.1 + CIDR=10.10.15.0/24 + COMPUTE_ETH=eth1 + ;; + 'default' ) + GW_IP=192.168.122.1 + CIDR=192.168.122.0/24 + COMPUTE_ETH=eth1 + ;; + * ) + GW_IP=192.168.122.1 + CIDR=192.168.122.0/24 + COMPUTE_ETH=eth1 + ;; +esac + +# launch eth on computer nodes and remove default gw route +launch_eth() { + computer_list=$(juju status --format short | grep -Eo 'nodes-compute/[0-9]') + for node in $computer_list; do + echo "node name is ${node}" + juju ssh $node "sudo ifconfig $COMPUTE_ETH 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 + juju set onos-controller gateway-mac=$GW_MAC + +} + +main() { + launch_eth + create_ext_network + update_gw_mac +} + +main "$@" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index b6996d7f..9b26389a 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -103,28 +103,28 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: charm: cs:trusty/ceph - num_units: 2 + num_units: 3 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - monitor-count: 1 + osd-devices: "" + monitor-count: 3 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" + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" + - "nodes-compute=0" + - "nodes-compute=1" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 1 @@ -356,6 +356,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty @@ -376,6 +377,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo @@ -395,6 +397,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 5e01c495..7fb81075 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -61,29 +61,28 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 @@ -184,6 +183,9 @@ openstack-phase2: - [ "cinder:shared-db", "mysql: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"] contrail: inherits: openstack-phase2 services: @@ -246,6 +248,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty @@ -271,6 +274,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo @@ -295,6 +299,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 6e1f700d..25c81b16 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -61,29 +61,28 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv + osd-devices: "" monitor-count: 1 - osd-reformat: 'no' +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: + - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + 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" + 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 @@ -234,7 +233,9 @@ contrail: - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ] - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ] - [ neutron-contrail, keystone ] - + - [ "ceph-osd:mon", "ceph:osd" ] + - [ "ceph-radosgw:mon", "ceph:radosgw" ] + - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] trusty-liberty-nodes: inherits: openstack-phase1 series: trusty @@ -252,6 +253,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty @@ -277,6 +279,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo @@ -301,6 +304,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst index dd4a4333..e1b9ac33 100644 --- a/docs/configguide/installerconfig.rst +++ b/docs/configguide/installerconfig.rst @@ -1,23 +1,231 @@ - -<Project> configuration ======================= -Add a brief introduction to configure OPNFV with this specific installer +Deploy JOID in your LAB +======================= + +Bare Metal Installations: +^^^^^^^^^^^^^^^^^^^^^^^^^ +Requirements as per Pharos: +^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Networking: +^^^^^^^^^^^ +**minimum 2 networks** + +| ``1. First for Admin network with gateway to access external network`` +| ``2. Second for public network to consume by tenants for floating ips`` + +**NOTE: JOID support multiple isolated networks for data as well as storage. +Based on your network options for Openstack.** + +Minimum 6 physical servers. +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1. Jump Host server: +~~~~~~~~~~~~~~~~~~~~ + +| `` Minimum H/W Spec needed`` +| `` CPU cores: 16`` +| `` Memory: 32 GB`` +| `` Hard Disk: 1(250 GB)`` +| `` NIC: eth0(Admin, Management), eth1 (external network)`` + +2. Control Node Servers (minimum 3): +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +| `` Minimum H/W Spec`` +| `` CPU cores: 16`` +| `` Memory: 32 GB`` +| `` Hard Disk: 1(500 GB)`` +| `` NIC: eth0(Admin, Management), eth1 (external network)`` + +3. Compute Node Servers (minimum 2): +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +| `` Minimum H/W Spec`` +| `` CPU cores: 16`` +| `` Memory: 32 GB`` +| `` Hard Disk: 1(1 TB) this includes the space for ceph as well`` +| `` NIC: eth0(Admin, Management), eth1 (external network)`` + +**NOTE: Above configuration is minimum and for better performance and usage of +the Openstack please consider higher spec for each nodes.** + +Make sure all servers are connected to top of rack switch and configured accordingly. No DHCP server should be up and configured. Only gateway at eth0 and eth1 network should be configure to access the network outside your lab. + +Jump Node configuration: +~~~~~~~~~~~~~~~~~~~~~~~~ + +1. Install Ubuntu 14.04 LTS server version of OS on the nodes. +2. Install the git and bridge-utils packages on the server and configure minimum two bridges on jump host: + +brAdm and brPublic cat /etc/network/interfaces + +| `` # The loopback network interface`` +| `` auto lo`` +| `` iface lo inet loopback`` +| `` iface eth0 inet manual`` +| `` auto brAdm `` +| `` iface brAdm inet static`` +| `` address 10.4.1.1`` +| `` netmask 255.255.248.0`` +| `` network 10.4.0.0`` +| `` broadcast 10.4.7.255`` +| `` gateway 10.4.0.1`` +| `` # dns-* options are implemented by the resolvconf package, if installed`` +| `` dns-nameservers 10.4.0.2`` +| `` bridge_ports eth0`` +| `` auto brPublic`` +| `` iface brPublic inet static`` +| `` address 10.2.66.2`` +| `` netmask 255.255.255.0`` +| `` bridge_ports eth2`` + +**NOTE: If you choose to use the separate network for management, data and +storage then you need to create bridge for each interface. In case of VLAN tags +use the appropriate network on jump-host depend upon VLAN ID on the interface.** + + +Configure JOID for your lab +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**Get the joid code from gerritt** + +*git clone https://gerrit.opnfv.org/gerrit/p/joid.git* + +*cd joid/ci* + +**Enable MAAS** + +- Create a directory in maas/<company name>/<pod number>/ for example + +*mkdir maas/intel/pod7/* + + +- Copy files from pod5 to pod7 + +*cp maas/intel/pod5/\* maas/intel/pod7/* + +4 files will get copied: deployment.yaml environments.yaml +interfaces.host lxc-add-more-interfaces + +deployment.yaml file +^^^^^^^^^^^^^^^^^^^^ + +Prerequisite: +~~~~~~~~~~~~~ + + +modify deployment.yaml +^^^^^^^^^^^^^^^^^^^^^^ + +This file has been used to configure your maas and bootstrap node in a +VM. Comments in the file are self explanatory and we expect fill up the +information according to match lab infrastructure information. Sample +deployment.yaml can be found at +https://gerrit.opnfv.org/gerrit/gitweb?p=joid.git;a=blob;f=ci/maas/intel/pod5/deployment.yaml + +modify joid/ci/01-deploybundle.sh +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +under section case $3 add the intelpod7 section and make sure you have +information provided correctly. Before example consider your network has +192.168.1.0/24 your default network. and eth1 is on public network which +will be used to assign the floating ip. + +| `` 'intelpod7' )`` +| `` # 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.1.2/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`` +| `` ;;`` + +NOTE: If you are using seprate data network then add this line below +also along with other changes. which represents network 10.4.9.0/24 will +be used for data network for openstack + +`` sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml`` + +modify joid/ci/02-maasdeploy.sh +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +under section case $1 add the intelpod7 section and make sure you have +information provided correctly. + +| `` 'intelpod7' )`` +| `` cp maas/intel/pod7/deployment.yaml ./deployment.yaml`` +| `` ;;`` + +NOTE: If you are using VLAN tags or more network for data and storage +then make sure you modify the case $1 section under Enable vlan +interface with maas appropriately. In the example below eth2 has been +used as separate data network for tenants in openstack with network +10.4.9.0/24 on compute and control nodes. + +| `` 'intelpod7' )`` +| `` maas refresh`` +| `` enableautomodebyname eth2 AUTO "10.4.9.0/24" compute || true`` +| `` enableautomodebyname eth2 AUTO "10.4.9.0/24" control || true`` +| `` ;;`` + +Deployment of OPNFV using JOID: +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Once you have done the change in above section then run the following +commands to do the automatic deployments. + +MAAS Install +~~~~~~~~~~~~ + +After integrating the changes as mentioned above run the MAAS install. +Suppose you name the integration lab as intelpod7 then run the below +commands to start the MAAS deployment. + +`` ./02-maasdeploy.sh intelpod7`` + +OPNFV Install +~~~~~~~~~~~~~ + +| `` ./deploy.sh -o liberty -s odl -t ha -l intelpod7 -f none`` +| `` `` -Pre-configuration activities ------------------------------ -Describe specific pre-configuration activities. Refer to Installations guide and release notes +NOTE: Possible options are as follows: -Hardware configuration ------------------------ -Describe the hardware configuration needed for this specific installer +| `` choose which sdn controller to use.`` +| `` [-s ``\ \ ``]`` +| `` nosdn: openvswitch only and no other SDN.`` +| `` odl: OpenDayLight Lithium version.`` +| `` opencontrail: OpenContrail SDN can be installed with Juno Openstack today.`` +| `` onos: ONOS framework as SDN.`` +| `` `` +| `` [-t ``\ \ ``] `` +| `` nonha: NO HA mode of Openstack`` +| `` ha: HA mode of openstack.`` +| `` [-o ``\ \ ``]`` +| `` juno: Juno Openstack`` +| `` liberty: Liberty version of openstack.`` +| `` [-l ``\ \ ``] etc...`` +| `` default: For virtual deployment where installation will be done on KVM created using ./02-maasdeploy.sh`` +| `` intelpod5: Install on bare metal OPNFV pod5 of Intel lab.`` +| `` intelpod6`` +| `` orangepod2`` +| `` ..`` +| `` ..`` +| `` ``\ \ ``: if you make changes as per your pod above then please use that.`` +| `` [-f ``\ \ ``]`` +| `` none: no special feature will be enabled.`` +| `` ipv6: ipv6 will be enabled for tenant in openstack.`` +| `` `` -Jumphost configuration ------------------------ -Describe intial Jumphost configuration (network and software)needed in order to deploy the installer +Troubleshoot +~~~~~~~~~~~~ -Platform components configuration ---------------------------------- -Describe the configuration of each component in the installer +By default debug is enabled in script and error messages will be printed +on ssh terminal where you are running the scripts. +To access of any control or compute nodes. juju ssh for example to login +into openstack-dashboard container. +| `` juju ssh openstack-dashboard/0 `` +| `` juju ssh nova-compute/0`` +| `` juju ssh neutron-gateway/0`` +By default juju will add the Ubuntu user keys for authentication into +the deployed server and only ssh access will be available. diff --git a/docs/installation-instructions.rst b/docs/installation-instructions.rst new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/docs/installation-instructions.rst |