diff options
Diffstat (limited to 'ci/opencontrail/juju-deployer/contrail-tip.yaml')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 104 |
1 files changed, 93 insertions, 11 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index be0ca99c..e881c29b 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -12,6 +12,17 @@ openstack-phase1: constraints: tags=compute "ntp": charm: "cs:trusty/ntp" + zookeeper: + branch: lp:~charmers/charms/precise/zookeeper/trunk + series: precise + to: + - "lxc:nodes-api=0" + cassandra: + branch: lp:~stub/charms/trusty/cassandra/noauthentication + to: + - "lxc:nodes-api=0" + options: + authenticator: AllowAllAuthenticator relations: - - "ntp:juju-info" - "nodes-api:juju-info" @@ -28,6 +39,62 @@ openstack-phase2: "max-connections": 10000 to: - "lxc:nodes-api=0" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer-agent": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + heat: + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + to: + - "lxc:nodes-api=0" + ceph: + charm: cs:trusty/ceph + num_units: 1 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 +# osd-reformat: 'yes' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# use-embedded-webserver: true +# to: +# - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 + to: + - "lxc:nodes-api=0" + cinder-ceph: + charm: cs:trusty/cinder-ceph "rabbitmq-server": branch: lp:charms/trusty/rabbitmq-server num_units: 1 @@ -100,20 +167,27 @@ openstack-phase2: - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] - [ neutron-api, neutron-api-contrail ] + - [ "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" ] contrail: inherits: openstack-phase2 services: - zookeeper: - branch: lp:~charmers/charms/precise/zookeeper/trunk - series: precise - to: - - "lxc:nodes-api=0" - cassandra: - branch: lp:~stub/charms/trusty/cassandra/noauthentication - to: - - "lxc:nodes-api=0" - options: - authenticator: AllowAllAuthenticator contrail-configuration: branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk to: @@ -175,6 +249,8 @@ trusty-liberty: #os-data-network: 10.4.8.0/21 region: Canonical openstack-origin: cloud:trusty-liberty + source: "cloud:trusty-liberty" + ceph-osd-replication-count: 1 trusty-kilo-nodes: inherits: openstack-phase1 @@ -195,6 +271,9 @@ trusty-kilo: #os-data-network: 10.4.8.0/21 region: Canonical openstack-origin: cloud:trusty-kilo + source: "cloud:trusty-kilo" + ceph-osd-replication-count: 1 + trusty-juno-nodes: inherits: openstack-phase1 @@ -214,4 +293,7 @@ trusty-juno: #os-data-network: 10.4.8.0/21 region: Canonical openstack-origin: cloud:trusty-juno + source: "cloud:trusty-juno" + ceph-osd-replication-count: 1 + |