modified on the lines of nosdn bundle tested. Only single gateway

needed for ceph. Modified bundle to include the role as admin
instead of Admin. As Admin create by default.

Change-Id: I14108f934c877f3ed67aca0e9527fc3b82b9266e

diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index cd0fc74..74682e7 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -90,6 +90,7 @@ openstack-phase2:
       options:
         admin-password: openstack
         admin-token: admin
+        admin-role: admin
         ha-mcastport: 5403
         vip: 10.4.1.13
       to:

diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml
index e291a7a..eae1081 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-tip.yaml
@@ -98,6 +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 --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 6d52a48..137321b 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -80,6 +80,7 @@ openstack-phase2:
       options:
         admin-password: openstack
         admin-token: admin
+        admin-role: admin
         ha-mcastport: 5403
       to:
         - "lxc:nodes-api=0"

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index f16dd64..4b7b20a 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -100,14 +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 @@ openstack-phase2:
 #        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 9119896..ac24385 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -98,6 +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 --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index 9f89d6f..b120f41 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -96,6 +96,7 @@ openstack-phase2:
 #        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard": 

diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index 9bacffc..a1b2688 100644 (file)
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-ha.yaml
@@ -100,14 +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 @@ openstack-phase2:
 #        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"

diff --git a/ci/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/onos-tip.yaml
index f8a7a6f..049ca08 100644 (file)
--- a/ci/onos/juju-deployer/onos-tip.yaml
+++ b/ci/onos/juju-deployer/onos-tip.yaml
@@ -98,6 +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 --git a/ci/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/onos.yaml
index 7d08182..44638d2 100644 (file)
--- a/ci/onos/juju-deployer/onos.yaml
+++ b/ci/onos/juju-deployer/onos.yaml
@@ -96,6 +96,7 @@ openstack-phase2:
 #        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard": 

diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 1c70e73..c837eeb 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -117,14 +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 @@ openstack-phase2:
       options: 
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"

diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index ca7ad4a..59379d0 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -107,6 +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 --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index f01d68e..fa9647b 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -106,6 +106,7 @@ openstack-phase2:
       options:
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard":