1 files changed, 163 insertions, 197 deletions

diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 13786b91..8b4cd6dd 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -1,115 +1,215 @@
 # vim: set ts=2 et:
+trusty-mitaka-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
+trusty-mitaka:
+  inherits: openstack-phase2
+  overrides:
+    #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
+    #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
+    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-api:
+    nodes:
       charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=compute
+      num_units: 2
     ntp:
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
-    - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
+  - - "ntp:juju-info"
+    - "nodes:juju-info"
+
 openstack-phase2:
   inherits: openstack-phase1
+  relations:
+    - - "nova-compute:neutron-plugin"
+      - "neutron-api:neutron-plugin"
+    - - "neutron-gateway"
+      - "onos-controller:ovsdb-manager"
+    - - "nova-compute:ovsdb-manager"
+      - "onos-controller:ovsdb-manager"
+    - - "neutron-api:onos-controller"
+      - "onos-controller:controller-api"
+    - - "keystone:shared-db"
+      - "mysql:shared-db"
+    - - "nova-cloud-controller:shared-db"
+      - "mysql:shared-db"
+    - - "nova-cloud-controller:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:image-service"
+      - "glance:image-service"
+    - - "nova-cloud-controller:identity-service"
+      - "keystone:identity-service"
+    - - "nova-cloud-controller:cloud-compute"
+      - "nova-compute:cloud-compute"
+    - - "nova-compute:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-compute:image-service"
+      - "glance:image-service"
+    - - "glance:shared-db"
+      - "mysql:shared-db"
+    - - "glance:identity-service"
+      - "keystone:identity-service"
+    - - "glance:amqp"
+      - "rabbitmq-server:amqp"
+    - - "openstack-dashboard:identity-service"
+      - "keystone:identity-service"
+    - - "neutron-api:shared-db"
+      - "mysql:shared-db"
+    - - "neutron-api:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:neutron-api"
+      - "neutron-api:neutron-api"
+    - - "neutron-api:identity-service"
+      - "keystone:identity-service"
+    - - "neutron-gateway:amqp"
+      - "rabbitmq-server:amqp"
+    - - "neutron-gateway:neutron-plugin-api"
+      - "neutron-api:neutron-plugin-api"
+    - - "nova-cloud-controller:quantum-network-service"
+      - "neutron-gateway:quantum-network-service"
+    - - "ceilometer:amqp"
+      - "rabbitmq-server:amqp"
+    - - "ceilometer-agent:ceilometer-service"
+      - "ceilometer:ceilometer-service"
+    - - "ceilometer:identity-service"
+      - "keystone:identity-service"
+    - - "ceilometer:identity-notifications"
+      - "keystone:identity-notifications"
+    - - "ceilometer-agent:nova-ceilometer"
+      - "nova-compute:nova-ceilometer"
+    - - "ceilometer:shared-db"
+      - "mongodb:database"
+    - - "heat:shared-db"
+      - "mysql:shared-db"
+    - - "heat:identity-service"
+      - "keystone:identity-service"
+    - - "heat:amqp"
+      - "rabbitmq-server:amqp"
+    - - "cinder:image-service"
+      - "glance:image-service"
+    - - "cinder:amqp"
+      - "rabbitmq-server:amqp"
+    - - "cinder:identity-service"
+      - "keystone:identity-service"
+    - - "cinder:cinder-volume-service"
+      - "nova-cloud-controller:cinder-volume-service"
+    - - "cinder-ceph:storage-backend"
+      - "cinder:storage-backend"
+    - - "ceph:client"
+      - "nova-compute:ceph"
+    - - "cinder:shared-db"
+      - "mysql:shared-db"
+    - - "ceph:client"
+      - "cinder-ceph:ceph"
+    - - "ceph:client"
+      - "glance:ceph"
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
+    #- - nova-compute:lxd
+      #- lxd:lxd
+
   services:
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
-      num_units: 1
+      charm: "local:trusty/percona-cluster"
       options:
         dataset-size: 2G
         max-connections: 10000
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
-      num_units: 1
+      charm: "local:trusty/ceilometer"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
-      num_units: 1
+      charm: "local:trusty/ceilometer"
+      num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
         osd-devices: ""
-        monitor-count: 1
+        monitor-count: 2
 #        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 1
+      charm: "local:trusty/ceph-osd"
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-compute=0"
+        - "nodes=0"
+        - "nodes=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
-      num_units: 1
+      charm: "local:trusty/ceph-radosgw"
       options:
         use-embedded-webserver: true
         operator-roles: "Member,admin"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
-      num_units: 1
+      charm: "local:trusty/cinder"
       options:
         block-device: None
         glance-api-version: 2
 #        ha-mcastport: 5401
 #        openstack-origin-git: include-file://cinder-master.yaml
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
-      num_units: 1
+      charm: "local:trusty/rabbitmq-server"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
-      num_units: 1
+      charm: "local:trusty/keystone"
       options:
         openstack-origin-git: include-file://keystone-master.yaml
         admin-password: openstack
         admin-token: admin
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
-      num_units: 1
+      charm: "local:trusty/openstack-dashboard"
       options:
         openstack-origin-git: include-file://horizon-master.yaml
         secret: admin
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
+      charm: local:trusty/nova-compute
       options:
         openstack-origin-git: include-file://nova-master.yaml
         enable-live-migration: true
@@ -117,186 +217,52 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
       to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
+        - "nodes=1"
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
-      num_units: 1
+      charm: "local:trusty/nova-cloud-controller"
       options:
         openstack-origin-git: include-file://nova-master.yaml
         console-access-protocol: novnc
         network-manager: Neutron
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      num_units: 1
+      charm: local:trusty/neutron-api
       options:
         neutron-security-groups: True
         manage-neutron-plugin-legacy-mode: False
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     neutron-gateway:
-      branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
+      charm: "local:trusty/neutron-gateway"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         #ext-port: "eth1"
         plugin: onos
         instance-mtu: 1400
       to:
-        - "nodes-api=0"
+        - "nodes=0"
     onos-controller:
-      branch: "lp:~wuwenbin2/onosfw/onos-controller"
+      charm: "local:trusty/onos-controller"
       options:
         #ext-port: "eth1"
         #gateway-mac: "default"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
-      num_units: 1
+      charm: "local:trusty/glance"
       options:
         openstack-origin-git: include-file://glance-master.yaml
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
+      charm: local:trusty/promise
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     neutron-api-onos:
-      branch: "lp:~wuwenbin2/onosfw/neutron-api-onos"
+      charm: "local:trusty/neutron-api-onos"
       options:
         overlay-network-type: 'vxlan'
         security-groups: True
     openvswitch-onos:
-      branch: "lp:~wuwenbin2/onosfw/openvswitch-onos"
-  relations:
-    - - "nova-compute:neutron-plugin"
-      - "neutron-api:neutron-plugin"
-    - - "neutron-gateway"
-      - "onos-controller:ovsdb-manager"
-    - - "nova-compute:ovsdb-manager"
-      - "onos-controller:ovsdb-manager"
-    - - "neutron-api:onos-controller"
-      - "onos-controller:controller-api"
-    - - "keystone:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:identity-service"
-      - "keystone:identity-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "glance:shared-db"
-      - "mysql:shared-db"
-    - - "glance:identity-service"
-      - "keystone:identity-service"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "openstack-dashboard:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-api:shared-db"
-      - "mysql:shared-db"
-    - - "neutron-api:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "neutron-api:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-gateway:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "nova-cloud-controller:quantum-network-service"
-      - "neutron-gateway:quantum-network-service"
-    - - "ceilometer:amqp"
-      - "rabbitmq-server:amqp"
-    - - "ceilometer-agent:ceilometer-service"
-      - "ceilometer:ceilometer-service"
-    - - "ceilometer:identity-service"
-      - "keystone:identity-service"
-    - - "ceilometer:identity-notifications"
-      - "keystone:identity-notifications"
-    - - "ceilometer-agent:nova-ceilometer"
-      - "nova-compute:nova-ceilometer"
-    - - "ceilometer:shared-db"
-      - "mongodb:database"
-    - - "heat:shared-db"
-      - "mysql:shared-db"
-    - - "heat:identity-service"
-      - "keystone:identity-service"
-    - - "heat:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:image-service"
-      - "glance:image-service"
-    - - "cinder:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:identity-service"
-      - "keystone:identity-service"
-    - - "cinder:cinder-volume-service"
-      - "nova-cloud-controller:cinder-volume-service"
-    - - "cinder-ceph:storage-backend"
-      - "cinder:storage-backend"
-    - - "ceph:client"
-      - "nova-compute:ceph"
-    - - "cinder:shared-db"
-      - "mysql:shared-db"
-    - - "ceph:client"
-      - "cinder-ceph:ceph"
-    - - "ceph:client"
-      - "glance:ceph"
-    - - "ceph-osd:mon"
-      - "ceph:osd"
-    - - "ceph-radosgw:mon"
-      - "ceph:radosgw"
-    - - "ceph-radosgw:identity-service"
-      - "keystone:identity-service"
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-liberty:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    source: "cloud:trusty-liberty"
-    openstack-origin: "cloud:trusty-liberty"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-kilo-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-# master
-trusty-kilo:
-  inherits: openstack-phase2
-  series: trusty
-  overrides:
-    region: Canonical
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
+      charm: "local:trusty/openvswitch-onos"