diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 2 | ||||
| -rwxr-xr-x | ci/02-maasdeploy.sh | 11 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 85 |
3 files changed, 95 insertions, 3 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index e1228a80..3e055c7a 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -27,6 +27,8 @@ case "$3" in sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml + # Use host for public API for Orange pod2 + sed -i -- 's/#os-public-hostname: api.public-fqdn/os-public-hostname: api.pod2.opnfv.fr/g' ./bundles.yaml ;; 'intelpod6' ) # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 0efbb1d8..6fa003f3 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -37,7 +37,7 @@ esac 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. +#make sure no password asked during the deployment. echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init @@ -73,9 +73,15 @@ sudo apt-add-repository ppa:juju/stable -y sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:liberty -y sudo apt-get update -y -sudo apt-get dist-upgrade -y +sudo apt-get dist-upgrade -y sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient gsutil -y +# To avoid problem between apiclient/maas_client and apiclient from google +# we remove the package google-api-python-client from yardstick installer +if [ $(pip list |grep google-api-python-client |wc -l) == 1 ]; then + sudo pip uninstall google-api-python-client +fi + sudo pip install shyaml juju init -f @@ -226,4 +232,3 @@ echo " .... MAAS deployment finished successfully ...." #echo "... Deployment of opnfv release Started ...." #python deploy.py $maas_ip - diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index f1d2ed12..85ee681c 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -39,6 +39,11 @@ openstack-phase2: options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' +# hacluster-heat: +# branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" +# options: +# corosync_key: | +# 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX' hacluster-horizon: branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: @@ -69,6 +74,7 @@ openstack-phase2: num_units: 3 options: vip: 10.4.1.14 + #os-public-hostname: api.public-fqdn to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" @@ -82,8 +88,14 @@ openstack-phase2: - "lxc:nodes-api=0" heat: branch: "lp:~openstack-charmers/charms/trusty/heat/next" + num_units: 3 + options: + #vip: 10.4.1.18 + #os-public-hostname: api.public-fqdn to: - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" ceph: branch: lp:~openstack-charmers/charms/trusty/ceph/next num_units: 3 @@ -123,6 +135,7 @@ openstack-phase2: options: block-device: None glance-api-version: 2 + #os-public-hostname: api.public-fqdn # ha-mcastport: 5401 to: - "lxc:nodes-api=1" @@ -145,6 +158,7 @@ openstack-phase2: admin-password: openstack admin-token: admin vip: 10.4.1.13 + #os-public-hostname: api.public-fqdn to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" @@ -184,6 +198,7 @@ openstack-phase2: service-guard: true neutron-external-network: ext_net vip: 10.4.1.16 + #os-public-hostname: api.public-fqdn to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" @@ -195,6 +210,7 @@ openstack-phase2: neutron-security-groups: True manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 + #os-public-hostname: api.public-fqdn to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" @@ -221,6 +237,7 @@ openstack-phase2: num_units: 3 options: vip: 10.4.1.12 + #os-public-hostname: api.public-fqdn # ha-mcastport: 5402 to: - "lxc:nodes-api=1" @@ -238,6 +255,72 @@ openstack-phase2: security-groups: True openvswitch-odl: branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk + haproxy: + charm: cs:trusty/haproxy + options: + services: | + - service_name: nova + service_host: "0.0.0.0" + service_port: 8774 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[nova, 10.4.1.16, 8774, check ]] + - service_name: swift + service_host: "0.0.0.0" + service_port: 80 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[swift, 10.4.1.100, 80, check ]] + - service_name: glance + service_host: "0.0.0.0" + service_port: 9292 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[glance, 10.4.1.12, 9292, check ]] + - service_name: cinderv2 + service_host: "0.0.0.0" + service_port: 8776 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[cinderv2, 10.4.1.100, 8776, check ]] + - service_name: ceilometer + service_host: "0.0.0.0" + service_port: 8777 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[ceilometer, 10.4.1.14, 8777, check ]] + - service_name: keystone + service_host: "0.0.0.0" + service_port: 5000 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[keystone, 10.4.1.13, 5000, check ]] + - service_name: heat + service_host: "0.0.0.0" + service_port: 8004 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[heat, 10.4.1.18, 8004, check ]] + - service_name: neutron + service_host: "0.0.0.0" + service_port: 9696 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[neutron, 10.4.1.17, 9696, check ]] + - service_name: heat-cfn + service_host: "0.0.0.0" + service_port: 8000 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[heat-cfn, 192.168.2.162, 8000, check ]] + - service_name: cinder + service_host: "0.0.0.0" + service_port: 8776 + service_options: [balance leastconn, cookie SRVNAME insert] + server_options: maxconn 100 cookie S{i} check + servers: [[cinder, 192.168.2.161, 8776, check ]] + to: + - "lxc:nodes-api=0" relations: - - "glance:ha" - "hacluster-glance:ha" @@ -251,6 +334,8 @@ openstack-phase2: - "hacluster-horizon:ha" - - "ceilometer:ha" - "hacluster-ceilometer:ha" +# - - "heat:ha" +# - "hacluster-heat:ha" - - "neutron-api:neutron-plugin-api-subordinate" - "neutron-api-odl:neutron-plugin-api-subordinate" - - "nova-compute:neutron-plugin" |