joid: remove brackets around 'admin-password' to homogenize variable in all config...

Change-Id: I208edfd75908e37c4bd69a20c78953874a86f540
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
(cherry picked from commit 77bd122e41e96a6dac164d45b750d2fc7c1c0c7f)

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 966c057..98f1d12 100644 (file)
--- 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 b46be98..396d2f7 100644 (file)
--- 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 9a47982..3758757 100644 (file)
--- 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 68b5f5e..0542404 100644 (file)
--- 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 56304ac..10b9736 100644 (file)
--- 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 67d4c47..616f39a 100644 (file)
--- 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 1218b24..4009f85 100644 (file)
--- 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 846fb02..7e1e47d 100644 (file)
--- 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 ef6a8ce..f8380cc 100644 (file)
--- 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 e678b39..cf62140 100644 (file)
--- 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"