summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 11:28:37 +0100
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 11:28:37 +0100
commit77bd122e41e96a6dac164d45b750d2fc7c1c0c7f (patch)
tree9b588f529f075322cb2755b383f98d43fe6a0eb7 /ci/opencontrail/juju-deployer
parent1662dbf63fc0efa418b75548268f226ecf88db5f (diff)
joid: remove brackets around 'admin-password' to homogenize variable in all config files
Change-Id: I208edfd75908e37c4bd69a20c78953874a86f540 Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 846fb020..7e1e47d1 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -158,7 +158,7 @@ openstack-phase2:
branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 3
options:
- "admin-password": openstack
+ admin-password: openstack
"admin-token": admin
vip: 10.4.1.13
to:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index ef6a8cea..f8380cc0 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -104,7 +104,7 @@ openstack-phase2:
branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 1
options:
- "admin-password": openstack
+ admin-password: openstack
"admin-token": admin
to:
- "lxc:nodes-api=0"
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index e678b391..cf621401 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -104,7 +104,7 @@ openstack-phase2:
num_units: 1
options:
openstack-origin-git: include-file://keystone-master.yaml
- "admin-password": openstack
+ admin-password: openstack
"admin-token": admin
to:
- "lxc:nodes-api=0"