diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 22 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 459 |
3 files changed, 244 insertions, 239 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 2d35d481..ef93aea2 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -27,6 +27,27 @@ case "$1" in ;; esac +#check whether charms are still executing the code even juju-deployer says installed. +check_status() { + retval=0 + timeoutiter=0 + while [ $retval -eq 0 ]; do + sleep 30 + juju status > status.txt + if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then + echo " still executing the reltionship within charms ..." + if [ $timeoutiter -ge 90 ]; then + retval=1 + fi + timeoutiter=$((timeoutiter+1)) + else + retval=1 + fi + done + status=`juju action do heat/0 domain-setup` + echo $status + echo "...... deployment finishing ......." +} #read the value from deployment.yaml if [ -e ~/.juju/deployment.yaml ]; then @@ -118,6 +139,7 @@ esac echo "... Deployment Started ...." juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes + check_status juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances" diff --git a/ci/deploy.sh b/ci/deploy.sh index a374d394..0382bb36 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -136,7 +136,7 @@ check_status() { juju status > status.txt if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then echo " still executing the reltionship within charms ..." - if [ $timeoutiter -ge 90 ]; then + if [ $timeoutiter -ge 60 ]; then retval=1 fi timeoutiter=$((timeoutiter+1)) diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index cfaecb54..748c3b12 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -1,9 +1,6 @@ # vim: set ts=2 et: trusty-mitaka-nodes: inherits: openstack-phase1 - -trusty-mitaka: - inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 @@ -19,6 +16,9 @@ trusty-mitaka: use-internal-endpoints: true #os-public-hostname: pod.maas +trusty-mitaka: + inherits: openstack-phase2 + openstack-phase1: services: nodes: @@ -26,13 +26,222 @@ openstack-phase1: num_units: 5 ntp: charm: "local:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes:juju-info" + neutron-gateway: + charm: "local:trusty/neutron-gateway" + options: + #ext-port: "eth1" + instance-mtu: 1400 + to: + - "nodes=0" + nova-cloud-controller: + charm: "local:trusty/nova-cloud-controller" + num_units: 3 + options: + console-access-protocol: novnc + #console-proxy-ip: pod.maas + network-manager: Neutron + service-guard: true + vip: 10.4.1.16 + to: + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" + nova-compute: + charm: "local:trusty/nova-compute" + num_units: 4 + options: + enable-live-migration: true + enable-resize: true + manage-neutron-plugin-legacy-mode: false + migration-auth-type: ssh + #hugepages: "50%" + #virt-type: lxd + to: + - "nodes=1" + - "nodes=2" + - "nodes=3" + - "nodes=4" + openstack-dashboard: + charm: "local:trusty/openstack-dashboard" + num_units: 3 + options: + secret: admin + webroot: / + vip: 10.4.1.11 + endpoint-type: internalURL + to: + - "lxc:nodes=3" + - "lxc:nodes=4" + - "lxc:nodes=0" + rabbitmq-server: + charm: "local:trusty/rabbitmq-server" + num_units: 3 + options: + vip: 10.4.1.10 + to: + - "lxc:nodes=4" + - "lxc:nodes=0" + - "lxc:nodes=1" + heat: + charm: "local:trusty/heat" + num_units: 3 + options: + vip: 10.4.1.18 + to: + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" + congress: + charm: local:trusty/congress + options: + #source-branch: stable/mitaka + to: + - "lxc:nodes=0" + glance: + charm: "local:trusty/glance" + num_units: 3 + options: + vip: 10.4.1.12 + to: + - "lxc:nodes=3" + - "lxc:nodes=4" + - "lxc:nodes=0" + opnfv-promise: + charm: local:trusty/promise + to: + - "lxc:nodes=0" + keystone: + charm: "local:trusty/keystone" + num_units: 3 + options: + admin-password: openstack + admin-token: admin + vip: 10.4.1.13 + to: + - "lxc:nodes=4" + - "lxc:nodes=0" + - "lxc:nodes=1" + mongodb: + charm: local:trusty/mongodb + to: + - "lxc:nodes=0" + mysql: + charm: "local:trusty/percona-cluster" + num_units: 3 + options: + dataset-size: 2G + max-connections: 20000 + lp1366997-workaround: true + root-password: 293rhc395m + sst-password: 127rc14t51 + vip: 10.4.1.15 + to: + - "lxc:nodes=0" + - "lxc:nodes=1" + - "lxc:nodes=2" + neutron-api: + charm: "local:trusty/neutron-api" + num_units: 3 + options: + neutron-security-groups: true + overlay-network-type: vxlan + #flat-network-providers: "*" + vip: 10.4.1.17 + to: + - "lxc:nodes=1" + - "lxc:nodes=2" + - "lxc:nodes=3" + ceph: + charm: "local:trusty/ceph" + num_units: 3 + options: + monitor-count: 3 + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== +# osd-reformat: 'yes' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "lxc:nodes=1" + - "lxc:nodes=2" + - "lxc:nodes=3" + ceph-osd: + charm: "local:trusty/ceph-osd" + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes=2" + - "nodes=3" + - "nodes=4" + ceph-radosgw: + charm: "local:trusty/ceph-radosgw" + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes=0" + cinder: + charm: "local:trusty/cinder" + num_units: 3 + options: + block-device: None + glance-api-version: 2 + vip: 10.4.1.19 + to: + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" + ceilometer: + charm: "local:trusty/ceilometer" + num_units: 3 + options: + vip: 10.4.1.14 + to: + - "lxc:nodes=0" + - "lxc:nodes=1" + - "lxc:nodes=2" + hacluster-keystone: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-cinder: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-heat: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-horizon: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-ceilometer: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-nova: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-neutron: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-glance: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + hacluster-mysql: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast -openstack-phase2: - inherits: openstack-phase1 relations: + - - ntp:juju-info + - nodes:juju-info - - mysql:ha - hacluster-mysql:ha - - glance:ha @@ -51,6 +260,10 @@ openstack-phase2: - hacluster-cinder:ha - - heat:ha - hacluster-heat:ha + +openstack-phase2: + inherits: openstack-phase1 + relations: - - nova-compute:amqp - rabbitmq-server:amqp - - neutron-gateway:amqp @@ -151,176 +364,10 @@ openstack-phase2: - rabbitmq-server:amqp services: - hacluster-keystone: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' - hacluster-cinder: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'cc6n5Zv6M2mQ2mUhTx/aKoImQ7q77pKDdkSwBUG5VqoSb23SxnGUsAxH5E8lOeCZ84EURzS71FEb8F9P5YY+2deh0+tdXukoKTugdVmJfarahPpWpEEZRRCigUngdFw/479FOcFCkN1SJtQNqWi1ACYSn1/GRoQ2vP+2byrkV6E=' - hacluster-heat: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'tNeFXmOqzytRq7loxLMDaaMqZZXjC7BNfMbcKxSNeIPyBj4lkJwHZyuV7mo0ogzcfVJqLBHBULai+ed9uyWCZJxLXoi+WwTj5AqcXfxfSo9vLCthukJJ4zuKvzeGibZRszwINf32RW9jtXSCPosv8a+9MSg49KD1c9fS20aEuIM=' - hacluster-horizon: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' - hacluster-ceilometer: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' - hacluster-nova: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' - hacluster-neutron: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' - hacluster-glance: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' - hacluster-mysql: - charm: "local:trusty/hacluster" - options: - corosync_transport: unicast - corosync_key: | - 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K' - ceilometer: - charm: "local:trusty/ceilometer" - num_units: 3 - options: - vip: 10.4.1.14 - to: - - "lxc:nodes=0" - - "lxc:nodes=1" - - "lxc:nodes=2" ceilometer-agent: charm: "local:trusty/ceilometer-agent" - ceph: - charm: "local:trusty/ceph" - num_units: 3 - options: - monitor-count: 3 - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== -# osd-reformat: 'yes' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "lxc:nodes=1" - - "lxc:nodes=2" - - "lxc:nodes=3" - ceph-osd: - charm: "local:trusty/ceph-osd" - num_units: 3 - options: - osd-devices: /srv - osd-reformat: 'yes' - to: - - "nodes=2" - - "nodes=3" - - "nodes=4" - ceph-radosgw: - charm: "local:trusty/ceph-radosgw" - options: - use-embedded-webserver: true - operator-roles: "Member,admin" - to: - - "lxc:nodes=0" - cinder: - charm: "local:trusty/cinder" - num_units: 3 - options: - block-device: None - glance-api-version: 2 - vip: 10.4.1.19 - to: - - "lxc:nodes=2" - - "lxc:nodes=3" - - "lxc:nodes=4" cinder-ceph: charm: "local:trusty/cinder-ceph" - glance: - charm: "local:trusty/glance" - num_units: 3 - options: - vip: 10.4.1.12 - to: - - "lxc:nodes=3" - - "lxc:nodes=4" - - "lxc:nodes=0" - opnfv-promise: - charm: local:trusty/promise - to: - - "lxc:nodes=0" - keystone: - charm: "local:trusty/keystone" - num_units: 3 - options: - admin-password: openstack - admin-token: admin - vip: 10.4.1.13 - to: - - "lxc:nodes=4" - - "lxc:nodes=0" - - "lxc:nodes=1" - mongodb: - charm: local:trusty/mongodb - to: - - "lxc:nodes=0" - mysql: - charm: "local:trusty/percona-cluster" - num_units: 3 - options: - min-cluster-size: 3 - max-connections: 20000 - lp1366997-workaround: true - root-password: 293rhc395m - sst-password: 127rc14t51 - vip: 10.4.1.15 - to: - - "lxc:nodes=0" - - "lxc:nodes=1" - - "lxc:nodes=2" - neutron-api: - charm: "local:trusty/neutron-api" - num_units: 3 - options: - neutron-security-groups: true - overlay-network-type: vxlan - #flat-network-providers: "*" - vip: 10.4.1.17 - to: - - "lxc:nodes=1" - - "lxc:nodes=2" - - "lxc:nodes=3" - neutron-gateway: - charm: "local:trusty/neutron-gateway" - options: - #ext-port: "eth1" - instance-mtu: 1400 - to: - - "nodes=0" neutron-openvswitch: charm: "local:trusty/neutron-openvswitch" options: @@ -329,67 +376,3 @@ openstack-phase2: #default-socket-memory: 1024 #defualt-socket-cores: 1 #dpdk-driver: uio_pci_generic - nova-cloud-controller: - charm: "local:trusty/nova-cloud-controller" - num_units: 3 - options: - console-access-protocol: novnc - #console-proxy-ip: pod.maas - network-manager: Neutron - service-guard: true - vip: 10.4.1.16 - to: - - "lxc:nodes=2" - - "lxc:nodes=3" - - "lxc:nodes=4" - nova-compute: - charm: "local:trusty/nova-compute" - num_units: 4 - options: - enable-live-migration: true - enable-resize: true - manage-neutron-plugin-legacy-mode: false - migration-auth-type: ssh - #hugepages: "50%" - #virt-type: lxd - to: - - "nodes=1" - - "nodes=2" - - "nodes=3" - - "nodes=4" - openstack-dashboard: - charm: "local:trusty/openstack-dashboard" - num_units: 3 - options: - secret: admin - webroot: / - vip: 10.4.1.11 - endpoint-type: internalURL - to: - - "lxc:nodes=3" - - "lxc:nodes=4" - - "lxc:nodes=0" - rabbitmq-server: - charm: "local:trusty/rabbitmq-server" - num_units: 3 - options: - vip: 10.4.1.10 - to: - - "lxc:nodes=4" - - "lxc:nodes=0" - - "lxc:nodes=1" - heat: - charm: "local:trusty/heat" - num_units: 3 - options: - vip: 10.4.1.18 - to: - - "lxc:nodes=2" - - "lxc:nodes=3" - - "lxc:nodes=4" - congress: - charm: local:trusty/congress - options: - #source-branch: stable/mitaka - to: - - "lxc:nodes=0" |