diff options
Diffstat (limited to 'ci/onos/juju-deployer/ovs-onos-ha.yaml')
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-ha.yaml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index e25e8ab7..9c455aba 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-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 @@ -174,10 +174,10 @@ 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" @@ -187,14 +187,14 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - 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=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" @@ -204,18 +204,18 @@ openstack-phase2: #ext-port: "eth1" plugin: onos instance-mtu: 1400 - to: + to: - "nodes-api=0" onos-controller: branch: "lp:~wuwenbin2/onosfw/onos-controller" options: #ext-port: "eth1" - 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: |