summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml33
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml32
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml32
3 files changed, 63 insertions, 34 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index d2873340..e4fea923 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -65,7 +65,7 @@ openstack-phase2:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
"ceilometer":
- charm: "cs:trusty/ceilometer"
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 3
options:
vip: 10.4.1.14
@@ -74,12 +74,16 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"ceilometer-agent":
- charm: "cs:trusty/ceilometer-agent"
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
"mongodb":
charm: "cs:trusty/mongodb"
num_units: 1
to:
- "lxc:nodes-api=0"
+ heat:
+ branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+ to:
+ - "lxc:nodes-api=0"
# ceph:
# charm: cs:trusty/ceph
# num_units: 1
@@ -279,19 +283,24 @@ openstack-phase2:
- "neutron-api:neutron-plugin-api"
- - "nova-cloud-controller:quantum-network-service"
- "neutron-gateway:quantum-network-service"
- - - "ceilometer"
- - "mongodb"
- - - "ceilometer"
- - "rabbitmq-server"
+ - - "ceilometer:amqp"
+ - "rabbitmq-server:amqp"
+ - - "ceilometer-agent:ceilometer-service"
+ - "ceilometer:ceilometer-service"
- - "ceilometer:identity-service"
- "keystone:identity-service"
- - - "ceilometer"
+ - - "ceilometer:identity-notifications"
- "keystone:identity-notifications"
- - - "ceilometer-agent"
- - "nova-compute"
- - - "ceilometer:ceilometer-service"
- - "ceilometer-agent:ceilometer-service"
-
+ - - "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:amqp"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index bcfaac17..ff9e554d 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -22,17 +22,21 @@ openstack-phase2:
services:
services:
"ceilometer":
- charm: "cs:trusty/ceilometer"
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
"ceilometer-agent":
- charm: "cs:trusty/ceilometer-agent"
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
"mongodb":
charm: "cs:trusty/mongodb"
num_units: 1
to:
- "lxc:nodes-api=0"
+ "heat"
+ branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+ to:
+ - "lxc:nodes-api=0"
"mysql":
charm: "cs:trusty/mysql"
num_units: 1
@@ -172,18 +176,24 @@ openstack-phase2:
- "neutron-api:neutron-plugin-api"
- - "nova-cloud-controller:quantum-network-service"
- "neutron-gateway:quantum-network-service"
- - - "ceilometer"
- - "mongodb"
- - - "ceilometer"
- - "rabbitmq-server"
+ - - "ceilometer:amqp"
+ - "rabbitmq-server:amqp"
+ - - "ceilometer-agent:ceilometer-service"
+ - "ceilometer:ceilometer-service"
- - "ceilometer:identity-service"
- "keystone:identity-service"
- - - "ceilometer"
+ - - "ceilometer:identity-notifications"
- "keystone:identity-notifications"
- - - "ceilometer-agent"
- - "nova-compute"
- - - "ceilometer:ceilometer-service"
- - "ceilometer-agent:ceilometer-service"
+ - - "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:amqp"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index ef05b276..39a96399 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -21,17 +21,21 @@ openstack-phase2:
inherits: openstack-phase1
services:
ceilometer:
- charm: cs:trusty/ceilometer
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
ceilometer-agent:
- charm: cs:trusty/ceilometer-agent
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
mongodb:
charm: cs:trusty/mongodb
num_units: 1
to:
- "lxc:nodes-api=0"
+ heat:
+ branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+ to:
+ - "lxc:nodes-api=0"
# ceph:
# charm: cs:trusty/ceph
# num_units: 1
@@ -206,18 +210,24 @@ openstack-phase2:
- "neutron-api:neutron-plugin-api"
- - "nova-cloud-controller:quantum-network-service"
- "neutron-gateway:quantum-network-service"
- - - "ceilometer"
- - "mongodb"
- - - "ceilometer"
- - "rabbitmq-server"
+ - - "ceilometer:amqp"
+ - "rabbitmq-server:amqp"
+ - - "ceilometer-agent:ceilometer-service"
+ - "ceilometer:ceilometer-service"
- - "ceilometer:identity-service"
- "keystone:identity-service"
- - - "ceilometer"
+ - - "ceilometer:identity-notifications"
- "keystone:identity-notifications"
- - - "ceilometer-agent"
- - "nova-compute"
- - - "ceilometer:ceilometer-service"
- - "ceilometer-agent:ceilometer-service"
+ - - "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:amqp"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides: