Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for...

diff --combined ci/nosdn/juju-deployer/ovs-ha.yaml
index cd0fc74,32896ad..74682e7
--- 1/ci/nosdn/juju-deployer/ovs-ha.yaml
--- 2/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 3
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 2
        constraints: tags=compute
      "ntp": 
@@@ -55,11 -55,13 +55,11 @@@ openstack-phase2
          - "nodes-api=2"
      ceph-radosgw:
        charm: cs:trusty/ceph-radosgw
 -      num_units: 3
 +      num_units: 1
        options:
          use-embedded-webserver: true
        to:
          - "lxc:nodes-api=0"
 -        - "lxc:nodes-api=1"
 -        - "lxc:nodes-api=2"
      cinder:
        charm: cs:trusty/cinder
        num_units: 3
@@@ -90,6 -92,7 +90,7 @@@
        options:
          admin-password: openstack
          admin-token: admin
+         admin-role: admin
          ha-mcastport: 5403
          vip: 10.4.1.13
        to:

diff --combined ci/nosdn/juju-deployer/ovs-tip.yaml
index e291a7a,6d08a4d..eae1081
--- 1/ci/nosdn/juju-deployer/ovs-tip.yaml
--- 2/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-tip.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp":
@@@ -98,6 -98,7 +98,7 @@@ openstack-phase2
          openstack-origin-git: include-file://keystone-master.yaml
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard":

diff --combined ci/nosdn/juju-deployer/ovs.yaml
index 6d52a48,b959b00..137321b
--- 1/ci/nosdn/juju-deployer/ovs.yaml
--- 2/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp": 
@@@ -80,6 -80,7 +80,7 @@@ openstack-phase2
        options:
          admin-password: openstack
          admin-token: admin
+         admin-role: admin
          ha-mcastport: 5403
        to:
          - "lxc:nodes-api=0"

diff --combined ci/odl/juju-deployer/ovs-odl-ha.yaml
index f16dd64,15b8aea..4b7b20a
--- 1/ci/odl/juju-deployer/ovs-odl-ha.yaml
--- 2/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 3
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 2
        constraints: tags=compute
      "ntp": 
@@@ -100,14 -100,12 +100,12 @@@ openstack-phase2
          - "nodes-compute=1"
      ceph-osd:
        charm: cs:trusty/ceph-osd
-       num_units: 3
+       num_units: 1
        options:
          osd-devices: /srv
          osd-reformat: 'yes'
        to:
          - "nodes-api=0"
-         - "nodes-api=1"
-         - "nodes-api=2"
      ceph-radosgw:
        charm: cs:trusty/ceph-radosgw
        num_units: 3
@@@ -144,6 -142,7 +142,7 @@@
  #        ha-mcastport: 5402
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
          vip: 10.4.1.13
        to:
          - "lxc:nodes-api=0"

diff --combined ci/odl/juju-deployer/ovs-odl-tip.yaml
index 9119896,1a540e1..ac24385
--- 1/ci/odl/juju-deployer/ovs-odl-tip.yaml
--- 2/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp":
@@@ -98,6 -98,7 +98,7 @@@ openstack-phase2
          openstack-origin-git: include-file://keystone-master.yaml
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard":

diff --combined ci/odl/juju-deployer/ovs-odl.yaml
index 9f89d6f,6bb318c..b120f41
--- 1/ci/odl/juju-deployer/ovs-odl.yaml
--- 2/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp": 
@@@ -96,6 -96,7 +96,7 @@@ openstack-phase2
  #        ha-mcastport: 5402
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard": 

diff --combined ci/onos/juju-deployer/onos-ha.yaml
index 9bacffc,5c83b84..a1b2688
--- 1/ci/onos/juju-deployer/onos-ha.yaml
--- 2/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-ha.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 3
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 2
        constraints: tags=compute
      "ntp": 
@@@ -100,14 -100,12 +100,12 @@@ openstack-phase2
          - "nodes-compute=1"
      ceph-osd:
        charm: cs:trusty/ceph-osd
-       num_units: 3
+       num_units: 1
        options:
          osd-devices: /srv
          osd-reformat: 'yes'
        to:
          - "nodes-api=0"
-         - "nodes-api=1"
-         - "nodes-api=2"
      ceph-radosgw:
        charm: cs:trusty/ceph-radosgw
        num_units: 3
@@@ -145,6 -143,7 +143,7 @@@
  #        ha-mcastport: 5402
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
          vip: 10.4.1.13
        to:
          - "lxc:nodes-api=0"

diff --combined ci/onos/juju-deployer/onos-tip.yaml
index f8a7a6f,1b00752..049ca08
--- 1/ci/onos/juju-deployer/onos-tip.yaml
--- 2/ci/onos/juju-deployer/onos-tip.yaml
+++ b/ci/onos/juju-deployer/onos-tip.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp":
@@@ -98,6 -98,7 +98,7 @@@ openstack-phase2
          openstack-origin-git: include-file://keystone-master.yaml
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard":

diff --combined ci/onos/juju-deployer/onos.yaml
index 7d08182,46ca358..44638d2
--- 1/ci/onos/juju-deployer/onos.yaml
--- 2/ci/onos/juju-deployer/onos.yaml
+++ b/ci/onos/juju-deployer/onos.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp": 
@@@ -96,6 -96,7 +96,7 @@@ openstack-phase2
  #        ha-mcastport: 5402
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard": 

diff --combined ci/opencontrail/juju-deployer/contrail-ha.yaml
index 1c70e73,f5afe1e..c837eeb
--- 1/ci/opencontrail/juju-deployer/contrail-ha.yaml
--- 2/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 3
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 2
        constraints: tags=compute
      "ntp": 
@@@ -117,14 -117,12 +117,12 @@@ openstack-phase2
          - "nodes-compute=1"
      ceph-osd:
        charm: cs:trusty/ceph-osd
-       num_units: 3
+       num_units: 1
        options:
          osd-devices: /srv
          osd-reformat: 'yes'
        to:
          - "nodes-api=0"
-         - "nodes-api=1"
-         - "nodes-api=2"
      ceph-radosgw:
        charm: cs:trusty/ceph-radosgw
        num_units: 3
@@@ -161,6 -159,7 +159,7 @@@
        options: 
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
          vip: 10.4.1.13
        to:
          - "lxc:nodes-api=0"

diff --combined ci/opencontrail/juju-deployer/contrail-tip.yaml
index ca7ad4a,6b1dd0a..59379d0
--- 1/ci/opencontrail/juju-deployer/contrail-tip.yaml
--- 2/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp":
@@@ -107,6 -107,7 +107,7 @@@ openstack-phase2
          openstack-origin-git: include-file://keystone-master.yaml
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard":

diff --combined ci/opencontrail/juju-deployer/contrail.yaml
index f01d68e,88408bd..fa9647b
--- 1/ci/opencontrail/juju-deployer/contrail.yaml
--- 2/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@@ -3,11 -3,11 +3,11 @@@ openstack-phase1
    series: trusty
    services:
      nodes-api:
 -      charm: "local:trusty/ubuntu-nodes-controller"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=control
      nodes-compute:
 -      charm: "local:trusty/ubuntu-nodes-compute"
 +      charm: "cs:trusty/ubuntu"
        num_units: 1
        constraints: tags=compute
      "ntp":
@@@ -106,6 -106,7 +106,7 @@@ openstack-phase2
        options:
          "admin-password": openstack
          "admin-token": admin
+         "admin-role": admin
        to:
          - "lxc:nodes-api=0"
      "openstack-dashboard":