OpenContrail Libery bug fixes. 25/9825/2
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>
Thu, 11 Feb 2016 19:19:28 +0000 (11:19 -0800)
committerSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>
Thu, 11 Feb 2016 19:21:57 +0000 (11:21 -0800)
Change-Id: I1cdcf5aa959b930f9a29a89ef7deebf7f11ff395

ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml

index da3a374..dd86cab 100644 (file)
@@ -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 ]
index d8d034c..c3b7160 100644 (file)
@@ -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
index 396ba36..3bce166 100644 (file)
@@ -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" ]