diff options
| author |   Sergey Kolekonov <skolekonov@mirantis.com> | 2016-08-08 20:03:02 +0300 |
|---|---|---|
| committer |   Carlos Camacho <ccamacho@redhat.com> | 2016-08-09 14:44:45 +0200 |
| commit | 20e1a821852d34f9c3201362cd619e41269ddbfd (patch) | |
| tree | 28c6fd552dc39794b64d4f123bbbc0126df63a12 /manifests/profile/base/neutron | |
| parent | 689d80e97188342c84bb965980d48c8ed212e60d (diff) | |
Use modern auth options for Neutron
auth plugins should be used instead of deprecated admin_* options
Change-Id: I80da7ce0a3d11859dd9f2ae02cd9761b9b28ac27
Depends-on: I3018932a106df562e94067e037b3bc862be97b51
Diffstat (limited to 'manifests/profile/base/neutron')
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index c8f3044..9104cc3 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -36,11 +36,11 @@ # # [*neutron_auth_password*] # (Optional) Password to use for Neutron authentication -# Defaults to hiera('neutron::server::auth_password') +# Defaults to hiera('neutron::server::password') # # [*neutron_auth_tenant*] # (Optional) Tenant to use for Neutron authentication -# Defaults to hiera('neutron::server::auth_tenant') +# Defaults to hiera('neutron::server::project_name') # # [*step*] # (Optional) The current step of the deployment @@ -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::auth_password', ''), - $neutron_auth_tenant = hiera('neutron::server::auth_tenant', ''), + $neutron_auth_password = hiera('neutron::server::password', ''), + $neutron_auth_tenant = hiera('neutron::server::project_name', ''), $step = hiera('step'), $vip = hiera('public_virtual_ip'), $zk_on_controller = hiera('enable_zookeeper_on_controller', ''), |