modified to clean the environment and also change in bundles to

[joid.git] / ci / opencontrail / juju-deployer / ovs-opencontrail-nonha.yaml

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index f8380cc..8b19ee3 100644 (file)
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -8,10 +8,13 @@ openstack-phase1:
       constraints: tags=control
     nodes-compute:
       charm: "cs:trusty/ubuntu"
-      num_units: 1
+      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
       series: precise
@@ -31,25 +34,25 @@ openstack-phase1:
 openstack-phase2:
   inherits: openstack-phase1
   services:
-    "mysql":
+    mysql:
       branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 1
       options:
-        "dataset-size": 2G
-        "max-connections": 10000
+        dataset-size: 2G
+        max-connections: 10000
       to:
         - "lxc:nodes-api=0"
-    "mongodb":
+    mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer":
+    ceilometer:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer-agent":
+    ceilometer-agent:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     heat:
       branch: "lp:~openstack-charmers/charms/trusty/heat/next"
@@ -57,7 +60,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     ceph:
       branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 1
+      num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
@@ -68,14 +71,16 @@ openstack-phase2:
 #        ceph-public-network: 192.168.0.0/24
       to:
         - "lxc:nodes-api=0"
+        - "lxc:nodes-api=0"
     ceph-osd:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 1
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
         - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
       branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
       num_units: 1
@@ -95,20 +100,20 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     cinder-ceph:
       branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
-    "rabbitmq-server":
+    rabbitmq-server:
       branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "keystone":
+    keystone:
       branch: lp:~openstack-charmers/charms/trusty/keystone/next
       num_units: 1
       options:
         admin-password: openstack
-        "admin-token": admin
+        admin-token: admin
       to:
         - "lxc:nodes-api=0"
-    "openstack-dashboard":
+    openstack-dashboard:
       branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 1
       options:
@@ -116,29 +121,29 @@ openstack-phase2:
         webroot: /
       to:
         - "lxc:nodes-api=0"
-    "nova-compute":
+    nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 1
       options:
-        "manage-neutron-plugin-legacy-mode": False
+        manage-neutron-plugin-legacy-mode: False
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
-    "nova-cloud-controller":
+    nova-cloud-controller:
       branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 1
       options:
-        "network-manager": Neutron
+        network-manager: Neutron
       to:
         - "lxc:nodes-api=0"
-    "neutron-api":
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+    neutron-api:
+      branch: lp:~opnfv-team/charms/trusty/neutron-api/next
       num_units: 1
       options:
         manage-neutron-plugin-legacy-mode: False
       to:
         - "lxc:nodes-api=0"
-    "glance":
+    glance:
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1
       to:
@@ -148,6 +153,12 @@ openstack-phase2:
       num_units: 1
       to:
         - "lxc:nodes-api=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        #source-branch: stable/mitaka
+      to:
+        - "lxc:nodes-api=0"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -187,6 +198,12 @@ openstack-phase2:
     - [ "ceph-osd:mon", "ceph:osd" ]
     - [ "ceph-radosgw:mon", "ceph:radosgw" ]
     - [ "ceph-radosgw:identity-service", "keystone:identity-service"]
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
 contrail:
   inherits: openstack-phase2
   services:
@@ -207,9 +224,9 @@ contrail:
       to:
         - "lxc:nodes-api=0"
     neutron-api-contrail:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
+      branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
     neutron-contrail:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
+      branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
   relations:
     - [ "contrail-configuration:cassandra", "cassandra:database" ]
     - [ contrail-configuration, zookeeper ]
@@ -222,7 +239,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 +249,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
@@ -249,7 +271,7 @@ trusty-liberty:
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -270,7 +292,7 @@ trusty-kilo:
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -290,7 +312,7 @@ trusty-juno:
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin