diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-07-11 09:16:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-11 09:16:17 +0000 |
| commit | cd9d1296ab33b0193bfd37e77241291065d9a06b (patch) | |
| tree | afa766272700f313609fcb23561a1f51c3189886 /fuel-plugin/deployment_scripts/puppet | |
| parent | 567694e4db2d0776db6c115b98f54a4737e52124 (diff) | |
| parent | e24c6c15d1ade7e0ddd1a39810bb803ed3bd9d56 (diff) | |
Merge "Update fuel plugin"
Diffstat (limited to 'fuel-plugin/deployment_scripts/puppet')
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp index 6547cb452..7993524d0 100644 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp @@ -7,6 +7,7 @@ $admin_user = $access_hash['user'] $admin_password = $access_hash['password'] $region = hiera('region', 'RegionOne') +$auth_api_version = 'v2.0' $service_endpoint = hiera('service_endpoint', $management_vip) $ssl_hash = hiera_hash('use_ssl', {}) $internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http') @@ -19,7 +20,7 @@ exec { "install yardstick": path => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"; } -osnailyfacter::credentials_file { '/opt/yardstick/openrc': +osnailyfacter::credentials_file { '/var/lib/yardstick.openrc': admin_user => $admin_user, admin_password => $admin_password, admin_tenant => $admin_tenant, |