modified admin-role: admin for all charms as there was an issue

where deployment failed if we add this option only to keystone
charm.

Change-Id: I8a50b201f897445cf606beed6068c6f7bae62787

3 files changed, 14 insertions, 4 deletions

diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index c3c57737..6cc86bf6 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -159,7 +159,6 @@ openstack-phase2:
       options: 
         "admin-password": openstack
         "admin-token": admin
-        "admin-role": admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"
@@ -356,6 +355,8 @@ trusty-liberty:
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
     ceph-osd-replication-count: 2
+    admin-role: admin
+
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -374,6 +375,8 @@ trusty-kilo:
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
     ceph-osd-replication-count: 2
+    admin-role: admin
+
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -391,5 +394,7 @@ trusty-juno:
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
     ceph-osd-replication-count: 2
+    admin-role: admin
+
 
 
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index 59379d0e..0fa8f697 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -107,7 +107,6 @@ 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":
@@ -253,6 +252,8 @@ trusty-liberty:
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
     ceph-osd-replication-count: 1
+    admin-role: admin
+
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -276,6 +277,8 @@ trusty-kilo:
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
     ceph-osd-replication-count: 1
+    admin-role: admin
+
 
 
 trusty-juno-nodes:
@@ -299,5 +302,5 @@ trusty-juno:
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
     ceph-osd-replication-count: 1
-
+    admin-role: admin
 
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index fa9647bc..b47580eb 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -106,7 +106,6 @@ openstack-phase2:
       options:
         "admin-password": openstack
         "admin-token": admin
-        "admin-role": admin
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard":
@@ -247,6 +246,7 @@ trusty-liberty:
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
     ceph-osd-replication-count: 1
+    admin-role: admin
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -270,6 +270,7 @@ trusty-kilo:
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
     ceph-osd-replication-count: 1
+    admin-role: admin
 
 
 trusty-juno-nodes:
@@ -293,5 +294,6 @@ trusty-juno:
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
     ceph-osd-replication-count: 1
+    admin-role: admin