From 5613bc5a0eb8f8e1e0174423d8d783aabc397e3d Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 12 Feb 2016 14:02:16 -0600
Subject: [PATCH] to fix keystone error in case of nonha bundle.

Change-Id: I82725975b7a3000dda8500fb46bec72be9c0af1b
---
 ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml               | 1 +
 ci/odl/juju-deployer/ovs-odl-nonha.yaml                 | 1 +
 ci/odl/juju-deployer/ovs-odl-tip.yaml                   | 1 +
 ci/onos/juju-deployer/ovs-onos-nonha.yaml               | 1 +
 ci/onos/juju-deployer/ovs-onos-tip.yaml                 | 1 +
 ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 1 +
 6 files changed, 6 insertions(+)

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 33dd5eb3..4eb6c6ff 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -70,6 +70,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index f7d7c476..97ebf598 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -70,6 +70,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 41c0fb16..79b10c14 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -70,6 +70,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 6e8a27c8..e1cdf936 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -70,6 +70,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index c186bd04..8ffdad6d 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -70,6 +70,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 3bce1661..71dd673c 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -84,6 +84,7 @@ openstack-phase2:
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
-- 
2.16.6