Merge "enabling Intel podp for EMC scalio"

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

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 966c057..ce2f25d 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -8,10 +8,10 @@ openstack-phase1:
       constraints: tags=control
     nodes-compute:
       charm: "cs:trusty/ubuntu"
-      num_units: 1
+      num_units: 2
       constraints: tags=compute
-    "ntp":
-      charm: "cs:trusty/ntp"
+    ntp:
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -20,33 +20,33 @@ openstack-phase1:
 openstack-phase2:
   inherits: openstack-phase1
   services:
-    "mysql":
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+    mysql:
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
-        "dataset-size": 2G
-        "max-connections": 10000
+        dataset-size: 2G
+        max-connections: 10000
       to:
         - "lxc:nodes-api=0"
-    "ceilometer":
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+    ceilometer:
+      charm: "local:trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer-agent":
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-    "mongodb":
-      charm: "cs:trusty/mongodb"
+    ceilometer-agent:
+      charm: "local:trusty/ceilometer-agent"
+    mongodb:
+      charm: "local:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "heat":
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+    heat:
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 1
+      charm: "local:trusty/ceph"
+      num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
@@ -57,23 +57,26 @@ 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
+      charm: "local:trusty/ceph-osd"
+      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"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -83,79 +86,79 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-    "rabbitmq-server":
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/cinder-ceph"
+    rabbitmq-server:
+      charm: "local:trusty/rabbitmq-server"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "keystone":
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+    keystone:
+      charm: "local:trusty/keystone"
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
-        "admin-password": openstack
-        "admin-token": admin
+        admin-password: openstack
+        admin-token: admin
       to:
         - "lxc:nodes-api=0"
-    "openstack-dashboard":
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+    openstack-dashboard:
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
         secret: admin
       to:
         - "lxc:nodes-api=0"
-    "nova-compute":
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
+    nova-compute:
+      charm: local:trusty/nova-compute
+      num_units: 2
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        "enable-live-migration": False
-        "manage-neutron-plugin-legacy-mode": False
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-    "nova-cloud-controller":
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+        - "nodes-compute=1"
+    nova-cloud-controller:
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        "console-access-protocol": novnc
-        "network-manager": Neutron
-        "quantum-security-groups": "yes"
+        console-access-protocol: novnc
+        network-manager: Neutron
       to:
         - "lxc:nodes-api=0"
-    "neutron-api":
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+    neutron-api:
+      charm: local:charms/trusty/neutron-api
       num_units: 1
       options:
         neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: "*"
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         instance-mtu: 1400
-#        "ext-port": "eth1"
+        #ext-port: "eth1"
       to:
         - "nodes-api=0"
-    "glance":
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+    glance:
+      charm: "local:trusty/glance"
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
       to:
         - "lxc:nodes-api=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
+      charm: local:trusty/promise
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
   relations:
@@ -245,43 +248,26 @@ openstack-phase2:
       - "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:
+trusty-mitaka-nodes:
   inherits: openstack-phase1
   overrides:
     series: trusty
 
-# master
-trusty-kilo:
+trusty-mitaka:
   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
+    #enable-dvr: true
+    #l2-population: true
+    #ext-port: "eth1"
+    region: Canonical
+    #source: "cloud:trusty-mitaka"
+    openstack-origin: "cloud:trusty-mitaka"
     series: trusty
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin