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.ubu
@media only all and (prefers-color-scheme: dark) {
.highlight .hll { background-color: #49483e }
.highlight .c { color: #75715e } /* Comment */
.highlight .err { color: #960050; background-color: #1e0010 } /* Error */
.highlight .k { color: #66d9ef } /* Keyword */
.highlight .l { color: #ae81ff } /* Literal */
.highlight .n { color: #f8f8f2 } /* Name */
.highlight .o { color: #f92672 } /* Operator */
.highlight .p { color: #f8f8f2 } /* Punctuation */
.highlight .ch { color: #75715e } /* Comment.Hashbang */
.highlight .cm { color: #75715e } /* Comment.Multiline */
.highlight .cp { color: #75715e } /* Comment.Preproc */
.highlight .cpf { color: #75715e } /* Comment.PreprocFile */
.highlight .c1 { color: #75715e } /* Comment.Single */
.highlight .cs { color: #75715e } /* Comment.Special */
.highlight .gd { color: #f92672 } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gi { color: #a6e22e } /* Generic.Inserted */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #75715e } /* Generic.Subheading */
.highlight .kc { color: #66d9ef } /* Keyword.Constant */
.highlight .kd { color: #66d9ef } /* Keyword.Declaration */
.highlight .kn { color: #f92672 } /* Keyword.Namespace */
.highlight .kp { color: #66d9ef } /* Keyword.Pseudo */
.highlight .kr { color: #66d9ef } /* Keyw     - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]</div><div class='ctx'>     - [ neutron-contrail, keystone ]</div><div class='add'>+    - [ contrail-configuration, ntp ]</div><div class='add'>+    - [ contrail-control, ntp ]</div><div class='add'>+    - [ contrail-analytics, ntp ]</div><div class='ctx'>     - [ contrail-configuration, haproxy ]</div><div class='ctx'>     - [ contrail-analytics, haproxy ]</div><div class='ctx'>     - [ contrail-webui, haproxy ]</div><div class='head'>diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml<br/>index d8d034cc..c3b7160e 100644<br/>--- a/<a href='/joid/tree/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml?h=opnfv-6.0.0&amp;id=18666ccb83424f16b6bdd90a106c2b4cd5dc98a6'>ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml</a><br/>+++ b/<a href='/joid/tree/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml?h=opnfv-6.0.0&amp;id=9df7c067854ca6427697aabf488efb3a7079eb64'>ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml</a></div><div class='hunk'>@@ -12,6 +12,9 @@ openstack-phase1:</div><div class='ctx'>       constraints: tags=compute</div><div class='ctx'>     ntp:</div><div class='ctx'>       charm: "cs:trusty/ntp"</div><div class='add'>+      options:</div><div class='add'>+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"</div><div class='add'>+        auto_peers: false</div><div class='ctx'>     zookeeper:</div><div class='ctx'>       branch: lp:~charmers/charms/precise/zookeeper/trunk</div><div class='ctx'>       series: precise</div><div class='hunk'>@@ -222,7 +225,8 @@ contrail:</div><div class='ctx'>     - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]</div><div class='ctx'>     - [ contrail-control, keystone ]</div><div class='ctx'>     - [ "contrail-analytics:cassandra", "cassandra:database" ]</div><div class='del'>-    - [ contrail-analytics, contrail-configuration ]</div><div class='add'>+    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]</div><div class='add'>+    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]</div><div class='ctx'>     - [ contrail-webui, keystone ]</div><div class='ctx'>     - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]</div><div class='ctx'>     - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]</div><div class='hunk'>@@ -231,6 +235,10 @@ contrail:</div><div class='ctx'>     - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]</div><div class='ctx'>     - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]</div><div class='ctx'>     - [ neutron-contrail, keystone ]</div><div class='add'>+    - [ contrail-configuration, ntp ]</div><div class='add'>+    - [ contrail-control, ntp ]</div><div class='add'>+    - [ contrail-analytics, ntp ]</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /trusty-liberty-nodes:</div><div class='ctx'>   inherits: openstack-phase1</div><div class='head'>diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml<br/>index 396ba367..3bce1661 100644<br/>--- a/<a href='/joid/tree/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml?h=opnfv-6.0.0&amp;id=18666ccb83424f16b6bdd90a106c2b4cd5dc98a6'>ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml</a><br/>+++ b/<a href='/joid/tree/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml?h=opnfv-6.0.0&amp;id=9df7c067854ca6427697aabf488efb3a7079eb64'>ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml</a></div><div class='hunk'>@@ -12,6 +12,9 @@ openstack-phase1:</div><div class='ctx'>       constraints: tags=compute</div><div class='ctx'>     ntp:</div><div class='ctx'>       charm: "cs:trusty/ntp"</div><div class='add'>+      options:</div><div class='add'>+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"</div><div class='add'>+        auto_peers: false</div><div class='ctx'>     zookeeper:</div><div class='ctx'>       branch: lp:~charmers/charms/precise/zookeeper/trunk</div><div class='ctx'>       series: precise</div><div class='hunk'>@@ -224,7 +227,8 @@ contrail:</div><div class='ctx'>     - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]</div><div class='ctx'>     - [ contrail-control, keystone ]</div><div class='ctx'>     - [ "contrail-analytics:cassandra", "cassandra:database" ]</div><div class='del'>-    - [ contrail-analytics, contrail-configuration ]</div><div class='add'>+    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]</div><div class='add'>+    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]</div><div class='ctx'>     - [ contrail-webui, keystone ]</div><div class='ctx'>     - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]</div><div class='ctx'>     - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]</div><div class='hunk'>@@ -233,6 +237,9 @@ contrail:</div><div class='ctx'>     - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]</div><div class='ctx'>     - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]</div><div class='ctx'>     - [ neutron-contrail, keystone ]</div><div class='add'>+    - [ contrail-configuration, ntp ]</div><div class='add'>+    - [ contrail-control, ntp ]</div><div class='add'>+    - [ contrail-analytics, ntp ]</div><div class='ctx'>     - [ "ceph-osd:mon", "ceph:osd" ]</div><div class='ctx'>     - [ "ceph-radosgw:mon", "ceph:radosgw" ]</div><div class='ctx'>     - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]</div></td></tr></table></div> <!-- class=content -->
<div id="lfcollabprojects-footer">
  <div class="gray-diagonal">
    <div class="footer-inner">
      <p>
        &copy; 2015
        <a href="https://opnfv.org/">Open Platform for NFV Project, Inc</a>., a
        Linux Foundation Collaborative Project. All Rights Reserved.
      </p>
      <p>
        Open Platform for NFV and OPNFV are trademarks of the Open Platform for
        NFV Project, Inc.
      </p>
      <p>
        Linux Foundation is a registered trademark of The Linux Foundation.
        Linux is a registered
        <a
          href="http://www.linuxfoundation.org/programs/legal/trademark"
          title="Linux Mark Institute"
          >trademark</a
        >
        of Linus Torvalds.
      </p>
      <p>
        Please see our
        <a href="https://opnfv.org/about/bylaws-and-policies/terms-use"
          >terms of use</a
        >,
        <a href="https://opnfv.org/about/bylaws-and-policies/trademarks"
          >trademark policy</a
        >, and
        <a href="https://opnfv.org/about/bylaws-and-policies/privacy-policy"
          >privacy policy</a
        >.
      </p>
    </div>
  </div>
</div>
</div> <!-- id=cgit -->
</body>
</html>
ighlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */