diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 2 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 297 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-ha.yaml | 280 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 5 |
5 files changed, 276 insertions, 310 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index ef93aea2..41a443b5 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -36,7 +36,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 748c3b12..680441bb 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -40,7 +40,7 @@ openstack-phase1: console-access-protocol: novnc #console-proxy-ip: pod.maas network-manager: Neutron - service-guard: true + #service-guard: true vip: 10.4.1.16 to: - "lxc:nodes=2" diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index c6b1dd23..aa6ec911 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -24,191 +24,46 @@ openstack-phase1: num_units: 5 ntp: charm: "local:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes:juju-info" - -openstack-phase2: - inherits: openstack-phase1 - relations: - - - "mysql:ha" - - "hacluster-mysql:ha" - - - "glance:ha" - - "hacluster-glance:ha" - - - "keystone:ha" - - "hacluster-keystone:ha" - - - "neutron-api:ha" - - "hacluster-neutron:ha" - - - "nova-cloud-controller:ha" - - "hacluster-nova:ha" - - - "openstack-dashboard:ha" - - "hacluster-horizon:ha" - - - "ceilometer:ha" - - "hacluster-ceilometer:ha" - - - "cinder:ha" - - "hacluster-cinder:ha" - - - "heat:ha" - - "hacluster-heat:ha" -# - - "ceph-radosgw:ha" -# - "hacluster-ceph-radosgw:ha" - - - "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-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "mysql:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "mysql:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "mysql:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "cinder:cinder-volume-service" - - "nova-cloud-controller:cinder-volume-service" - - - "cinder-ceph:storage-backend" - - "cinder:storage-backend" - - - "ceph:client" - - "nova-compute:ceph" - - - "cinder:shared-db" - - "mysql:shared-db" - - - "ceph:client" - - "cinder-ceph:ceph" - - - "ceph:client" - - "glance:ceph" - - - "ceph-osd:mon" - - "ceph:osd" - - - "ceph-radosgw:mon" - - "ceph:radosgw" - - - "ceph-radosgw:identity-service" - - "keystone:identity-service" - #- - nova-compute:lxd - #- lxd:lxd - - - congress:shared-db - - mysql:shared-db - - - congress:identity-service - - keystone:identity-service - - - congress:amqp - - 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-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-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K' # hacluster-ceph-radosgw: # charm: "local:trusty/hacluster" # options: -# corosync_key: | -# 'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw=' +# corosync_transport: unicast mysql: charm: "local:trusty/percona-cluster" num_units: 3 @@ -233,8 +88,6 @@ openstack-phase2: - "lxc:nodes=1" - "lxc:nodes=2" - "lxc:nodes=3" - ceilometer-agent: - charm: "local:trusty/ceilometer-agent" mongodb: charm: "local:trusty/mongodb" to: @@ -297,8 +150,6 @@ openstack-phase2: - "lxc:nodes=4" - "lxc:nodes=0" - "lxc:nodes=1" - cinder-ceph: - charm: local:trusty/cinder-ceph rabbitmq-server: charm: local:trusty/rabbitmq-server num_units: 3 @@ -352,7 +203,7 @@ openstack-phase2: options: console-access-protocol: novnc network-manager: Neutron - service-guard: true + #service-guard: true vip: 10.4.1.16 #os-public-hostname: api.public-fqdn to: @@ -402,16 +253,146 @@ openstack-phase2: charm: local:trusty/promise to: - "lxc:nodes=0" - neutron-api-odl: - charm: local:trusty/neutron-api-odl - options: - overlay-network-type: 'vxlan' - security-groups: True - openvswitch-odl: - charm: local:trusty/openvswitch-odl congress: charm: local:trusty/congress options: #source-branch: stable/mitaka to: - "lxc:nodes=0" + relations: + - - "ntp:juju-info" + - "nodes:juju-info" + - - "mysql:ha" + - "hacluster-mysql:ha" + - - "glance:ha" + - "hacluster-glance:ha" + - - "keystone:ha" + - "hacluster-keystone:ha" + - - "neutron-api:ha" + - "hacluster-neutron:ha" + - - "nova-cloud-controller:ha" + - "hacluster-nova:ha" + - - "openstack-dashboard:ha" + - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" + - - "cinder:ha" + - "hacluster-cinder:ha" + - - "heat:ha" + - "hacluster-heat:ha" +# - - "ceph-radosgw:ha" +# - "hacluster-ceph-radosgw:ha" + +openstack-phase2: + inherits: openstack-phase1 + 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-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "cinder:cinder-volume-service" + - "nova-cloud-controller:cinder-volume-service" + - - "cinder-ceph:storage-backend" + - "cinder:storage-backend" + - - "ceph:client" + - "nova-compute:ceph" + - - "cinder:shared-db" + - "mysql:shared-db" + - - "ceph:client" + - "cinder-ceph:ceph" + - - "ceph:client" + - "glance:ceph" + - - "ceph-osd:mon" + - "ceph:osd" + - - "ceph-radosgw:mon" + - "ceph:radosgw" + - - "ceph-radosgw:identity-service" + - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp + services: + cinder-ceph: + charm: local:trusty/cinder-ceph + ceilometer-agent: + charm: "local:trusty/ceilometer-agent" + openvswitch-odl: + charm: local:trusty/openvswitch-odl + neutron-api-odl: + charm: local:trusty/neutron-api-odl + options: + overlay-network-type: 'vxlan' + security-groups: True diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 404ff050..06cb5019 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -24,175 +24,41 @@ openstack-phase1: num_units: 5 ntp: charm: "local:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes:juju-info" - -openstack-phase2: - inherits: openstack-phase1 - relations: - - - "mysql:ha" - - "hacluster-mysql:ha" - - - "glance:ha" - - "hacluster-glance:ha" - - - "keystone:ha" - - "hacluster-keystone:ha" - - - "neutron-api:ha" - - "hacluster-neutron:ha" - - - "nova-cloud-controller:ha" - - "hacluster-nova:ha" - - - "openstack-dashboard:ha" - - "hacluster-horizon:ha" - - - "ceilometer:ha" - - "hacluster-ceilometer:ha" - - - "neutron-api:neutron-plugin-api-subordinate" - - "neutron-api-onos:neutron-plugin-api-subordinate" - - - "nova-compute:neutron-plugin" - - "openvswitch-onos:neutron-plugin" - - - "neutron-gateway" - - "openvswitch-onos" - - - "openvswitch-onos:ovsdb-manager" - - "onos-controller:ovsdb-manager" - - - "neutron-api-onos:onos-controller" - - "onos-controller:controller-api" - - - "keystone:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "mysql:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "mysql:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "mysql:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "cinder:cinder-volume-service" - - "nova-cloud-controller:cinder-volume-service" - - - "cinder-ceph:storage-backend" - - "cinder:storage-backend" - - - "ceph:client" - - "nova-compute:ceph" - - - "cinder:shared-db" - - "mysql:shared-db" - - - "ceph:client" - - "cinder-ceph:ceph" - - - "ceph:client" - - "glance:ceph" - - - "ceph-osd:mon" - - "ceph:osd" - - - "ceph-radosgw:mon" - - "ceph:radosgw" - - - "ceph-radosgw:identity-service" - - "keystone:identity-service" - #- - nova-compute:lxd - #- lxd:lxd - - - congress:shared-db - - mysql:shared-db - - - congress:identity-service - - keystone:identity-service - - - congress:amqp - - rabbitmq-server:amqp - services: hacluster-keystone: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' hacluster-horizon: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' 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-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K' mysql: charm: "local:trusty/percona-cluster" num_units: 3 options: dataset-size: 2G lp1366997-workaround: true - max-connections: 10000 + max-connections: 20000 root-password: 293rhc395m sst-password: 127rc14t51 vip: 10.4.1.15 @@ -209,8 +75,6 @@ openstack-phase2: - "lxc:nodes=2" - "lxc:nodes=3" - "lxc:nodes=4" - ceilometer-agent: - charm: "local:trusty/ceilometer-agent" mongodb: charm: "local:trusty/mongodb" to: @@ -261,8 +125,6 @@ openstack-phase2: - "lxc:nodes=4" - "lxc:nodes=0" - "lxc:nodes=1" - cinder-ceph: - charm: "local:trusty/cinder-ceph" rabbitmq-server: charm: "local:trusty/rabbitmq-server" num_units: 3 @@ -315,7 +177,7 @@ openstack-phase2: options: console-access-protocol: novnc network-manager: Neutron - service-guard: true + #service-guard: true vip: 10.4.1.16 to: - "lxc:nodes=3" @@ -361,16 +223,140 @@ openstack-phase2: charm: local:trusty/promise to: - "lxc:nodes=0" - neutron-api-onos: - charm: "local:trusty/neutron-api-onos" - options: - overlay-network-type: 'vxlan' - security-groups: True - openvswitch-onos: - charm: "local:trusty/openvswitch-onos" congress: charm: local:trusty/congress options: #source-branch: stable/mitaka to: - "lxc:nodes=0" + relations: + - - "ntp:juju-info" + - "nodes:juju-info" + - - "mysql:ha" + - "hacluster-mysql:ha" + - - "glance:ha" + - "hacluster-glance:ha" + - - "keystone:ha" + - "hacluster-keystone:ha" + - - "neutron-api:ha" + - "hacluster-neutron:ha" + - - "nova-cloud-controller:ha" + - "hacluster-nova:ha" + - - "openstack-dashboard:ha" + - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" + +openstack-phase2: + inherits: openstack-phase1 + relations: + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-onos:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-onos:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-onos" + - - "openvswitch-onos:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api-onos:onos-controller" + - "onos-controller:controller-api" + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "cinder:cinder-volume-service" + - "nova-cloud-controller:cinder-volume-service" + - - "cinder-ceph:storage-backend" + - "cinder:storage-backend" + - - "ceph:client" + - "nova-compute:ceph" + - - "cinder:shared-db" + - "mysql:shared-db" + - - "ceph:client" + - "cinder-ceph:ceph" + - - "ceph:client" + - "glance:ceph" + - - "ceph-osd:mon" + - "ceph:osd" + - - "ceph-radosgw:mon" + - "ceph:radosgw" + - - "ceph-radosgw:identity-service" + - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp + services: + ceilometer-agent: + charm: "local:trusty/ceilometer-agent" + cinder-ceph: + charm: "local:trusty/cinder-ceph" + openvswitch-onos: + charm: "local:trusty/openvswitch-onos" + neutron-api-onos: + charm: "local:trusty/neutron-api-onos" + options: + overlay-network-type: 'vxlan' + security-groups: True diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 2d28e548..176e59a1 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -79,7 +79,7 @@ contrail: to: - "lxc:nodes=0" contrail-control: - charm: lcoal:trusty/contrail-control + charm: local:trusty/contrail-control to: - "lxc:nodes=1" contrail-analytics: @@ -172,8 +172,7 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" - monitor-count: 1 + monitor-count: 2 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 |