summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml11
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml10
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml9
3 files changed, 26 insertions, 4 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index da3a3743..dd86cab0 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -10,8 +10,11 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 2
constraints: tags=compute
- ntp:
+ 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
num_units: 3
@@ -332,7 +335,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" ]
@@ -341,6 +345,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 ]
- [ contrail-configuration, haproxy ]
- [ contrail-analytics, haproxy ]
- [ contrail-webui, haproxy ]
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index d8d034cc..c3b7160e 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.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
@@ -222,7 +225,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" ]
@@ -231,6 +235,10 @@ 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 ]
+
/trusty-liberty-nodes:
inherits: openstack-phase1
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" ]