summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-02-12 14:02:16 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-02-12 20:05:34 +0000
commit85413a8d7fd4fa6a6c420e774f2c0c5a94cfc121 (patch)
treef053aa16259eb8fe31ddd354e02424d39290023a
parent75f3196755a382dc135ed484ec56f46a638c3ede (diff)
to fix keystone error in case of nonha bundle.
Change-Id: I82725975b7a3000dda8500fb46bec72be9c0af1b (cherry picked from commit 5613bc5a0eb8f8e1e0174423d8d783aabc397e3d)
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml1
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml1
6 files changed, 6 insertions, 0 deletions
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 6796db0a..c5f6eae4 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 fbe0c984..d9496599 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: