4 files changed, 96 insertions, 84 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 4740a676..f22bd535 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -21,40 +21,40 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      charm: cs:trusty/ceilometer
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 3
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     ceilometer-agent:
-      charm: cs:trusty/ceilometer-agent
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     ceph:
-      charm: cs:trusty/ceph
-      num_units: 2
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      num_units: 3
       options:
-        monitor-count: 1
+        monitor-count: 3
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
+        osd-devices: ""
+#        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
-      num_units: 3
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
-        - "nodes-api=1"
-        - "nodes-api=2"
+        - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -62,7 +62,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 3
       options:
         block-device: None
@@ -73,10 +73,10 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
+      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
       num_units: 0
     glance:
-      charm: cs:trusty/glance
+      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
       num_units: 3
       options:
         ha-mcastport: 5402
@@ -91,7 +91,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=2"
     keystone:
-      charm: cs:trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 3
       options:
         admin-password: openstack
@@ -121,7 +121,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     neutron-api:
-      charm: cs:trusty/neutron-api
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
       num_units: 3
       options:
         neutron-security-groups: true
@@ -131,7 +131,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     neutron-gateway:
-      charm: cs:trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       num_units: 1
       options:
 #        "ext-port": "eth1"
@@ -139,10 +139,10 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      charm: cs:trusty/neutron-openvswitch
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
       num_units: 0
     nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 3
       options:
         network-manager: Neutron
@@ -154,7 +154,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     nova-compute:
-      charm: cs:trusty/nova-compute
+      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
       num_units: 2
       options:
         enable-live-migration: true
@@ -168,7 +168,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard
+      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 3
       options:
         secret: admin
@@ -179,38 +179,38 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
+      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 3
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     heat:
-      charm: cs:trusty/heat
+      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
       to:
         - "lxc:nodes-api=0"
     hacluster-keystone:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
     hacluster-horizon:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     hacluster-nova:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     hacluster-neutron:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     hacluster-glance:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
@@ -324,6 +324,7 @@ 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"
@@ -342,6 +343,7 @@ trusty-kilo:
   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-kilo"
@@ -360,6 +362,7 @@ trusty-juno:
   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-juno"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 85cf997c..3be7e824 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -21,35 +21,35 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      charm: cs:trusty/ceilometer
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      charm: cs:trusty/ceilometer-agent
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
       num_units: 1
       options:
         monitor-count: 1
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
+        osd-devices: ""
+#        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
+        - "lxc:nodes-api=0"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
+        - "nodes-compute=0"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -57,7 +57,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
       options:
         block-device: None
@@ -66,10 +66,10 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
+      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
       num_units: 0
     glance:
-      charm: cs:trusty/glance
+      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
       num_units: 1
       options:
         ha-mcastport: 5402
@@ -81,7 +81,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     keystone:
-      charm: cs:trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 1
       options:
         admin-password: openstack
@@ -102,14 +102,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      charm: cs:trusty/neutron-api
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
       num_units: 1
       options:
         neutron-security-groups: true
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      charm: cs:trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       num_units: 1
       options:
         instance-mtu: 1400
@@ -117,10 +117,10 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      charm: cs:trusty/neutron-openvswitch
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
       num_units: 0
     nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 1
       options:
         network-manager: Neutron
@@ -128,7 +128,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      charm: cs:trusty/nova-compute
+      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
       num_units: 1
       options:
         enable-live-migration: true
@@ -142,7 +142,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard
+      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 1
       options:
         secret: admin
@@ -150,12 +150,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
+      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      charm: cs:trusty/heat
+      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
       to:
         - "lxc:nodes-api=0"
   relations:
@@ -258,6 +258,7 @@ 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"
@@ -276,6 +277,7 @@ trusty-kilo:
   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-kilo"
@@ -294,6 +296,7 @@ trusty-juno:
   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-juno"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 98d7ba7a..75f3cafd 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     "mysql":
-      charm: "cs:trusty/mysql"
+      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 1
       options:
         "dataset-size": 2G
@@ -45,37 +45,35 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
       num_units: 1
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
+        osd-devices: ""
         monitor-count: 1
-        osd-reformat: 'no'
+#        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
+        - "lxc:nodes-api=0"
+    ceph-osd:
+      charm: cs:trusty/ceph-osd
+      num_units: 1
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-
-#        - "lxc:nodes-api=0"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+      to:
+        - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
       options:
         block-device: None
@@ -85,14 +83,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
+      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
     "rabbitmq-server":
-      branch: lp:charms/trusty/rabbitmq-server
+      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     "keystone":
-      branch: lp:charms/trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -101,7 +99,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard":
-      branch: lp:charms/trusty/openstack-dashboard
+      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -119,7 +117,7 @@ openstack-phase2:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
     "nova-cloud-controller":
-      branch: lp:charms/trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -137,7 +135,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: lp:charms/trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         instance-mtu: 1400
@@ -145,7 +143,7 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     "glance":
-      branch: lp:charms/trusty/glance
+      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
@@ -157,7 +155,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
   relations:
@@ -241,6 +239,12 @@ openstack-phase2:
       - "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:
@@ -250,6 +254,7 @@ 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"
@@ -271,6 +276,7 @@ trusty-kilo:
   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
diff --git a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
index 184cecc6..de0dd764 100755
--- a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
@@ -17,7 +17,7 @@ keystone user-create --name demo --tenant demo --pass demo --email demo@demo.dem
 nova keypair-add --pub-key id_rsa.pub ubuntu-keypair
 
 # configure external network
-neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat
+neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat --shared
 neutron subnet-create ext-net --name ext-subnet --allocation-pool start=10.5.8.5,end=10.5.8.254 --disable-dhcp --gateway 10.5.8.1 10.5.8.0/24
 
 # create vm network