]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Merge "Add Puppet 4.x lint checks"
authorJenkins <jenkins@review.openstack.org>
Mon, 16 Mar 2015 06:16:56 +0000 (06:16 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 16 Mar 2015 06:16:56 +0000 (06:16 +0000)
1  2 
manifests/api.pp

index c427c6f542a396aa0fa3d1327a48eda557216fe5,1d793323b9ab43bdc1ed338600c7970a98429934..fd58ddeb52fb20a8c1757d24ec316f93d1282948
@@@ -72,18 -72,12 +72,18 @@@ class ceilometer::api 
    $keystone_tenant            = 'services',
    $keystone_password          = false,
    $keystone_auth_uri          = false,
 +  $keystone_identity_uri      = false,
    $host                       = '0.0.0.0',
 -  $port                       = '8777'
 +  $port                       = '8777',
 +  # DEPRECATED PARAMETERS
 +  $keystone_host              = '127.0.0.1',
 +  $keystone_port              = '35357',
 +  $keystone_auth_admin_prefix = false,
 +  $keystone_protocol          = 'http',
  ) {
  
-   include ceilometer::params
-   include ceilometer::policy
+   include ::ceilometer::params
+   include ::ceilometer::policy
  
    validate_string($keystone_password)