From 4f228f6f29221fe9a6a4f3d138b4039101d661af Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 23 May 2016 21:38:15 -0500
Subject: modified bundles to use Canonical converged architecture after
 discussion.

Change-Id: I2b5ecc04b083a840850f351276a18d810e28e5f3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 71 ++++++++++-------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

(limited to '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 f473561f..647a1019 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -2,29 +2,21 @@
 openstack-phase1:
   series: trusty
   services:
-    nodes-api:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
+    nodes:
       charm: "cs:trusty/ubuntu"
       num_units: 2
-      constraints: tags=compute
-    ntp: 
+    ntp:
       charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
+      - "nodes:juju-info"
+openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
       charm: "local:trusty/ceilometer"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     ceph:
@@ -39,8 +31,8 @@ openstack-phase2:
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=0"
     ceph-osd:
       charm: "local:trusty/ceph-osd"
       num_units: 2
@@ -48,86 +40,76 @@ openstack-phase2:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "nodes=0"
+        - "nodes=1"
     ceph-radosgw:
       charm: "local:trusty/ceph-radosgw"
-      num_units: 1
       options:
         use-embedded-webserver: true
         operator-roles: "Member,admin"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     cinder:
       charm: "local:trusty/cinder"
-      num_units: 1
       options:
         block-device: None
         glance-api-version: 2
         ha-mcastport: 5401
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     cinder-ceph:
       charm: "local:trusty/cinder-ceph"
-      num_units: 0
     glance:
       charm: "local:trusty/glance"
-      num_units: 1
       options:
         ha-mcastport: 5402
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     opnfv-promise:
       charm: local:trusty/promise
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     keystone:
       charm: "local:trusty/keystone"
-      num_units: 1
       options:
         admin-password: openstack
         admin-token: admin
         ha-mcastport: 5403
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     mongodb:
       charm: local:trusty/mongodb
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     mysql:
       charm: "local:trusty/percona-cluster"
-      num_units: 1
       options:
         max-connections: 20000
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     neutron-api:
       charm: "local:trusty/neutron-api"
-      num_units: 1
       options:
         neutron-security-groups: true
         flat-network-providers: "*"
 #        overlay-network-type: vxlan
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     neutron-gateway:
       charm: "local:trusty/neutron-gateway"
-      num_units: 1
       options:
         instance-mtu: 1400
         #ext-port: "eth1"
       to:
-        - "nodes-api=0"
+        - "nodes=0"
     neutron-openvswitch:
       charm: "local:trusty/neutron-openvswitch"
-      num_units: 0
     nova-cloud-controller:
       charm: "local:trusty/nova-cloud-controller"
-      num_units: 1
       options:
         network-manager: Neutron
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     nova-compute:
       charm: "local:trusty/nova-compute"
       num_units: 2
@@ -137,28 +119,23 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
+        - "nodes=0"
+        - "nodes=1"
     openstack-dashboard:
       charm: "local:trusty/openstack-dashboard"
-      num_units: 1
       options:
         secret: admin
         webroot: /
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     rabbitmq-server:
       charm: "local:trusty/rabbitmq-server"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     heat:
       charm: "local:trusty/heat"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
   relations:
     - - nova-compute:amqp
       - rabbitmq-server:amqp
-- 
cgit 1.2.3-korg