From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 16 Mar 2015 06:16:56 +0000 (+0000)
Subject: Merge "Add Puppet 4.x lint checks"
X-Git-Tag: 6.0.0~35
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b2e352b9c1e6f20f0c86d31598e67c125bfc1b40;p=puppet-modules%2Fpuppet-ceilometer.git

Merge "Add Puppet 4.x lint checks"
---

b2e352b9c1e6f20f0c86d31598e67c125bfc1b40
diff --cc manifests/api.pp
index c427c6f,1d79332..fd58dde
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@@ -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)