summaryrefslogtreecommitdiffstats
path: root/ci/onos
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-02-08 13:35:10 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-02-08 20:09:10 +0000
commit069bb3a3a90422a5771052f6f2f9fd19848ebc07 (patch)
treeda051a05e43ce74748580a552fb7746cc92c05c7 /ci/onos
parentf51e156d5ee09316cf6c40dacc1101f04b5619ec (diff)
forgot " in the last.
Change-Id: I89d8a050c2ccf34fe98223749d644177e349d055 (cherry picked from commit 3b421b0613b80edce3e87944a74b21f82ba4c46f)
Diffstat (limited to 'ci/onos')
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml26
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml34
2 files changed, 30 insertions, 30 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:
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 7ef33fcc..6796db0a 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -10,17 +10,17 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 1
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:
- mysql:
+ services:
+ mysql:
branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 1
options:
@@ -83,21 +83,21 @@ openstack-phase2:
- "lxc:nodes-api=0"
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: 1
to:
- "lxc:nodes-api=0"
- keystone:
+ keystone:
branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
- options:
+ options:
# ha-mcastport: 5402
admin-password: openstack
admin-token: admin
to:
- "lxc:nodes-api=0"
- openstack-dashboard:
+ openstack-dashboard:
branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 1
options:
@@ -105,10 +105,10 @@ openstack-phase2:
webroot: /
to:
- "lxc:nodes-api=0"
- nova-compute:
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
- options:
+ options:
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
to:
@@ -117,22 +117,22 @@ 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: 1
- options:
+ options:
console-access-protocol: novnc
network-manager: Neutron
quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
- neutron-api:
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
neutron-security-groups: True
manage-neutron-plugin-legacy-mode: False
- to:
+ to:
- "lxc:nodes-api=0"
neutron-gateway:
branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
@@ -140,15 +140,15 @@ 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=0"
- glance:
+ glance:
branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
to: