diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-01 16:42:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-01 16:42:06 +0000 |
| commit | ca7fe0e0fbf77127f9df332a8b106e5984bc7652 (patch) | |
| tree | 61504f5a99955e97ec4f2d36623d309f9f0e2c49 /manifests/profile | |
| parent | 60ce868eee7a1a3369da8418c0b4cfd8ec6e3227 (diff) | |
| parent | 7ef3c6ab0389f0ab7bae1635d8eb62292bf671d1 (diff) | |
Merge "midonet: update neutron parameter"
Diffstat (limited to 'manifests/profile')
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 9104cc3..3ba9dd9 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -67,8 +67,8 @@ class tripleo::profile::base::neutron::midonet ( $bind_address = hiera('neutron::bind_host', ''), $keystone_admin_token = hiera('keystone::admin_token', ''), $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), - $neutron_auth_password = hiera('neutron::server::password', ''), - $neutron_auth_tenant = hiera('neutron::server::project_name', ''), + $neutron_auth_password = hiera('neutron::keystone::authtoken::password', ''), + $neutron_auth_tenant = hiera('neutron::keystone::authtoken::project_name', ''), $step = hiera('step'), $vip = hiera('public_virtual_ip'), $zk_on_controller = hiera('enable_zookeeper_on_controller', ''), |