diff options
Diffstat (limited to 'ci/opencontrail')
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" |