From 0af6211ff740a032b226ec99b138d996ddafcaed Mon Sep 17 00:00:00 2001 From: David Blaisonneau Date: Thu, 28 Jan 2016 11:28:37 +0100 Subject: joid: remove brackets around 'admin-password' to homogenize variable in all config files Change-Id: I208edfd75908e37c4bd69a20c78953874a86f540 Signed-off-by: David Blaisonneau (cherry picked from commit 77bd122e41e96a6dac164d45b750d2fc7c1c0c7f) --- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 +- ci/onos/juju-deployer/ovs-onos-ha.yaml | 2 +- ci/onos/juju-deployer/ovs-onos-nonha.yaml | 2 +- ci/onos/juju-deployer/ovs-onos-tip.yaml | 2 +- ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 2 +- ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 2 +- ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ci') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 966c0573..98f1d121 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -94,7 +94,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" diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index b46be986..396d2f7d 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -142,7 +142,7 @@ openstack-phase2: num_units: 3 options: # ha-mcastport: 5402 - "admin-password": openstack + admin-password: openstack "admin-token": admin vip: 10.4.1.13 to: diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 9a47982c..3758757a 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -93,7 +93,7 @@ openstack-phase2: num_units: 1 options: # ha-mcastport: 5402 - "admin-password": openstack + admin-password: openstack "admin-token": admin 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 68b5f5ed..0542404a 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -94,7 +94,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" diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 56304ac3..10b9736d 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -144,7 +144,7 @@ openstack-phase2: num_units: 3 options: # ha-mcastport: 5402 - "admin-password": openstack + admin-password: openstack "admin-token": admin vip: 10.4.1.13 to: diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 67d4c471..616f39ab 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -93,7 +93,7 @@ openstack-phase2: num_units: 1 options: # ha-mcastport: 5402 - "admin-password": openstack + admin-password: openstack "admin-token": admin to: - "lxc:nodes-api=0" diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 1218b246..4009f85d 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -94,7 +94,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" 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" -- cgit 1.2.3-korg