summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
diff options
context:
space:
mode:
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-02-11 11:19:28 -0800
committerSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-02-11 11:21:57 -0800
commit9df7c067854ca6427697aabf488efb3a7079eb64 (patch)
tree87d17a6468353fc4889ed58fab5d362c876975ea /ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
parent18666ccb83424f16b6bdd90a106c2b4cd5dc98a6 (diff)
OpenContrail Libery bug fixes.
Change-Id: I1cdcf5aa959b930f9a29a89ef7deebf7f11ff395
Diffstat (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml9
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 396ba367..3bce1661 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -12,6 +12,9 @@ openstack-phase1:
constraints: tags=compute
ntp:
charm: "cs:trusty/ntp"
+ options:
+ source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+ auto_peers: false
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk
series: precise
@@ -224,7 +227,8 @@ contrail:
- [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
- [ contrail-control, keystone ]
- [ "contrail-analytics:cassandra", "cassandra:database" ]
- - [ contrail-analytics, contrail-configuration ]
+ - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
+ - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
- [ contrail-webui, keystone ]
- [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
- [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
@@ -233,6 +237,9 @@ contrail:
- [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
- [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
- [ neutron-contrail, keystone ]
+ - [ contrail-configuration, ntp ]
+ - [ contrail-control, ntp ]
+ - [ contrail-analytics, ntp ]
- [ "ceph-osd:mon", "ceph:osd" ]
- [ "ceph-radosgw:mon", "ceph:radosgw" ]
- [ "ceph-radosgw:identity-service", "keystone:identity-service" ]