modfied openstack.sh to create only required data.

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

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 3601d2c..de7f754 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -1,8 +1,6 @@
 # vim: set ts=2 et:
 trusty-mitaka-nodes:
   inherits: openstack-phase1
-  overrides:
-    series: trusty
 
 trusty-mitaka:
   inherits: openstack-phase2
@@ -15,13 +13,11 @@ trusty-mitaka:
     region: Canonical
     #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
-    series: trusty
     ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
 openstack-phase1:
-  series: trusty
   services:
     nodes:
       charm: "cs:trusty/ubuntu"
@@ -127,6 +123,12 @@ openstack-phase2:
       - rabbitmq-server:amqp
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     ceilometer:
       charm: "local:trusty/ceilometer"
@@ -141,7 +143,6 @@ openstack-phase2:
         monitor-count: 2
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
 #        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
@@ -169,7 +170,6 @@ openstack-phase2:
       options:
         block-device: None
         glance-api-version: 2
-        ha-mcastport: 5401
       to:
         - "lxc:nodes=1"
     cinder-ceph:
@@ -177,7 +177,6 @@ openstack-phase2:
     glance:
       charm: "local:trusty/glance"
       options:
-        ha-mcastport: 5402
       to:
         - "lxc:nodes=0"
     opnfv-promise:
@@ -189,7 +188,6 @@ openstack-phase2:
       options:
         admin-password: openstack
         admin-token: admin
-        ha-mcastport: 5403
       to:
         - "lxc:nodes=0"
     mongodb:
@@ -206,8 +204,8 @@ openstack-phase2:
       charm: "local:trusty/neutron-api"
       options:
         neutron-security-groups: true
-        flat-network-providers: "*"
-#        overlay-network-type: vxlan
+        #flat-network-providers: "*"
+        overlay-network-type: vxlan
       to:
         - "lxc:nodes=1"
     neutron-gateway:
@@ -257,3 +255,9 @@ openstack-phase2:
       charm: "local:trusty/heat"
       to:
         - "lxc:nodes=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        #source-branch: stable/mitaka
+      to:
+        - "lxc:nodes=1"