Stable/kilo

Puppetfile

@@ -7,19 +7,19 @@ mod 'aviator',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
-  :commit => 'f17b3442402529281bdca9b2f70697e04bcfe216',
+  :commit => '05926aaaba5f733f7be1f3e57b59db3ee1385db3',
   :git => 'https://github.com/openstack/puppet-ceilometer.git'
 
 mod 'ceph',
-  :commit => 'b6ab15b47c81d7694fdcfd75d8f2e0a0481ca40c',
+  :commit => '71fccdf944a2b0721a972a8a86f97703cabd586e',
   :git => 'https://github.com/stackforge/puppet-ceph.git'
 
 mod 'certmonger',
   :commit => '3f86b9973fc30c14a066b0f215023d5f1398b874',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '15fd1a81b047342e71bfe939cf059eb4fd143e4d',
+  :commit => '330dda3c4106ffef318d330f4de303b631196581',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -43,27 +43,27 @@ mod 'galera',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '0bb7577f7e4189495a148ca91f4f92c118e499e7',
+  :commit => 'c2d8e72f594b0caab0ace8c17d59717a3dd13385',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
   :commit => 'da4dd8e45d7f3e3acc77ceba01d96c5bb4675424',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => '388ace2495661ff909b45c00471a121b5f2d18e3',
+  :commit => '02692807d218210a27a4043e27b3aa0ac38e8b28',
   :git => 'https://github.com/openstack/puppet-gnocchi.git'
 
 mod 'haproxy',
   :commit => 'fc13a7e7716f1689e38ae6bb4a9bbc713be9ae6b',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '8e742b8d09e3bded06e9529ccd5e7f38e527ab5d',
+  :commit => '3ced80f2eb6fc8a0694e8586c212d1a3ec5a3bdc',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '6e11fbf346560dab461964e53bcb1c817707abc5',
+  :commit => '79e373bebc010c25410a684437ae41b60e8eefc8',
   :git => 'https://github.com/openstack/puppet-horizon.git'
 
 mod 'inifile',
@@ -75,19 +75,23 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '886a9c0aa2c8ac6167e2d95a60c55bbd6977f82b',
+  :commit => '88c228cca9d74072a5e944acf0063418b9bdfe4e',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => 'e0e87604b8199c0ac0d443999153f88fb7797a9c',
+  :commit => '6dbef6298478b5a8799c9dadd8d0b4b7edbcdd74',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
+mod 'kmod',
+  :commit => 'ea03df0eff7b7e5faccb9c4e386d451301468f04',
+  :git => 'https://github.com/camptocamp/puppet-kmod.git'
+
 mod 'manila',
-  :commit => 'ff018bdef812bacfe512663c1cc0b92c7d1f26b2',
+  :commit => 'b94391158dc7c392986db9b0eb63562dde411ea1',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
@@ -111,19 +115,19 @@ mod 'mysql',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
-  :commit => 'ed391d3d9bdcccef3e2de3b0da98e654237d99a5',
+  :commit => '8266fb6dd504bc6ab310644728b076a6de996cbd',
   :git => 'https://github.com/stackforge/puppet-n1k-vsm.git'
 
 mod 'nagios',
   :commit => '56a1eee350c4600bb12e017d64238fb3f876abd4',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '36b463c003f94fe23c3d9eff207bbf5005ee470c',
+  :commit => 'c683ca5fc31111b7b0569cc71e9b959e62d21c4b',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'cb2d487fb9baf2c1902182973e29982b5389e769',
+  :commit => 'ea1eddfaa04a3c44d9b6863bb4a87c89b91f3305',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
@@ -135,15 +139,15 @@ mod 'ntp',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
-  :commit => 'ab8ddaff93e06d7fdbfb2c61ffe9113562dd82ad',
+  :commit => '2d08ba975b65c613fbdc08812cbf30e7d6c9d6e4',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => '78ef674e0e6bc73b3a0af7833025dc9786eaeaeb',
+  :commit => 'fcfffcf47069119805e44cc712739ba0c1e4603d',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
-  :commit => '1fa8e5591ab606a7be3bae32df088f6cec26d3c0',
+  :commit => 'e9a8f0d048c1bbc86a4bb1ee81417da3afe6673e',
   :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',
@@ -155,7 +159,7 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => '1cdf6568473a0a45fb0b06b21b0c9a82c398bf08',
+  :commit => 'aa3ec5e061f619f4340a9c6ef1465f2f6a673cb4',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
@@ -171,7 +175,7 @@ mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '56d9a841bff7389d1128d40dad4a319988d547f1',
+  :commit => '6e79d710a97d7c43aea766bbfa8c4d782a7c2049',
   :git => 'https://github.com/openstack/puppet-sahara.git'
 
 mod 'snmp',
@@ -191,31 +195,31 @@ mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '275fb9b111bbb30148e762afc0798aa891091cf2',
+  :commit => 'd736e6a00e8ff1e4f05c8fbc9535908fc2112587',
   :git => 'https://github.com/openstack/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => 'ab9601ff339f6acb40901291133c03cf1b45d5ee',
+  :commit => '4cc2ad2e827e1117d79dbab1bc91283428ffdc78',
   :git => 'https://github.com/openstack/puppet-tempest.git'
 
 mod 'timezone',
   :commit => '734918982a512f51a3f1855396d2d7da3f37f53c',
   :git => 'https://github.com/saz/puppet-timezone.git'
 
 mod 'tripleo',
-  :commit => '717eb39ca7295e128ab99694ea3a7ae658b9528f',
+  :commit => 'a003b3d97ebe8bd470717c419434851d60669bf7',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '2636a384f67c2ac1513ac709f3ae4525668ccb62',
+  :commit => '1c5d6895c86fdb99501c72ef999864268bb7a389',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',
-  :commit => '85a3991330f36903cd66a6e12512b54ab758ec41',
+  :commit => '09e2ced9be2cdf5d94dd6310e9df3a3155ab549b',
   :git => 'https://github.com/openstack/puppet-tuskar.git'
 
 mod 'vcsrepo',
@@ -227,7 +231,7 @@ mod 'vlan',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => 'e73073a120d833958d22925a1badbc1ccdc0f15a',
+  :commit => '5992d41a238c93bcf6bd6989c23d3c7577c48b69',
   :git => 'https://github.com/openstack/puppet-vswitch.git'
 
 mod 'xinetd',

ceilometer/CHANGELOG.md

@@ -1,3 +1,32 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Move rabbit/kombu settings to oslo_messaging_rabbit section
+
+####Features
+- Puppet 4.x support
+- make crontab for expirer optional
+- Refactorise Keystone resources management
+- db: Added postgresql backend using openstacklib helper
+- Implement Ceilometer-API as a WSGI process support
+- Add support for ceilometer-polling agent
+- Add support for identity_uri
+- Tag all Ceilometer packages
+- Add udp_address/udp_port parameters for collector.
+- Deprecate old public, internal and admin parameters
+
+####Bugfixes
+- Ensure python-mysqldb is installed before MySQL db_sync
+- Fix dependency on nova-common package
+
+####Maintenance
+- Acceptance tests with Beaker
+- Fix spec tests for RSpec 3.x and Puppet 4.x
+
+
 ##2015-06-17 - 5.1.0
 ###Summary
 

ceilometer/README.md

@@ -1,7 +1,7 @@
 Ceilometer
 ==========
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 

ceilometer/manifests/agent/auth.pp

@@ -29,14 +29,20 @@
 #  [*auth_cacert*]
 #    Certificate chain for SSL validation. Optional; Defaults to 'None'
 #
+#  [*auth_endpoint_type*]
+#    Type of endpoint in Identity service catalog to use for
+#    communication with OpenStack services.
+#    Optional. Defaults to undef.
+#
 class ceilometer::agent::auth (
   $auth_password,
-  $auth_url         = 'http://localhost:5000/v2.0',
-  $auth_region      = 'RegionOne',
-  $auth_user        = 'ceilometer',
-  $auth_tenant_name = 'services',
-  $auth_tenant_id   = '',
-  $auth_cacert      = undef,
+  $auth_url           = 'http://localhost:5000/v2.0',
+  $auth_region        = 'RegionOne',
+  $auth_user          = 'ceilometer',
+  $auth_tenant_name   = 'services',
+  $auth_tenant_id     = '',
+  $auth_cacert        = undef,
+  $auth_endpoint_type = undef,
 ) {
 
   if ! $auth_cacert {
@@ -59,4 +65,10 @@
     }
   }
 
+  if $auth_endpoint_type {
+    ceilometer_config {
+      'service_credentials/os_endpoint_type' : value => $auth_endpoint_type;
+    }
+  }
+
 }

ceilometer/manifests/api.pp

@@ -64,6 +64,15 @@
 #    (optional) ensure state for package.
 #    Defaults to 'present'
 #
+# [*service_name*]
+#   (optional) Name of the service that will be providing the
+#   server functionality of ceilometer-api.
+#   If the value is 'httpd', this means ceilometer-api will be a web
+#   service, and you must use another class to configure that
+#   web service. For example, use class { 'ceilometer::wsgi::apache'...}
+#   to make keystone be a web app using apache mod_wsgi.
+#   Defaults to '$::ceilometer::params::api_service_name'
+#
 class ceilometer::api (
   $manage_service             = true,
   $enabled                    = true,
@@ -75,23 +84,24 @@
   $keystone_identity_uri      = false,
   $host                       = '0.0.0.0',
   $port                       = '8777',
+  $service_name               = $::ceilometer::params::api_service_name,
   # DEPRECATED PARAMETERS
   $keystone_host              = '127.0.0.1',
   $keystone_port              = '35357',
   $keystone_auth_admin_prefix = false,
   $keystone_protocol          = 'http',
-) {
+) inherits ceilometer::params {
 
   include ::ceilometer::params
   include ::ceilometer::policy
 
   validate_string($keystone_password)
 
-  Ceilometer_config<||> ~> Service['ceilometer-api']
-  Class['ceilometer::policy'] ~> Service['ceilometer-api']
+  Ceilometer_config<||> ~> Service[$service_name]
+  Class['ceilometer::policy'] ~> Service[$service_name]
 
   Package['ceilometer-api'] -> Ceilometer_config<||>
-  Package['ceilometer-api'] -> Service['ceilometer-api']
+  Package['ceilometer-api'] -> Service[$service_name]
   Package['ceilometer-api'] -> Class['ceilometer::policy']
   package { 'ceilometer-api':
     ensure => $package_ensure,
@@ -106,16 +116,30 @@
       $service_ensure = 'stopped'
     }
   }
-
-  Package['ceilometer-common'] -> Service['ceilometer-api']
-  service { 'ceilometer-api':
-    ensure     => $service_ensure,
-    name       => $::ceilometer::params::api_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    require    => Class['ceilometer::db'],
-    subscribe  => Exec['ceilometer-dbsync']
+  Package['ceilometer-common'] -> Service[$service_name]
+
+  if $service_name == $::ceilometer::params::api_service_name {
+    service { 'ceilometer-api':
+      ensure     => $service_ensure,
+      name       => $::ceilometer::params::api_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      require    => Class['ceilometer::db'],
+      subscribe  => Exec['ceilometer-dbsync'],
+      tag        => 'ceilometer-service',
+    }
+  } elsif $service_name == 'httpd' {
+    include ::apache::params
+    service { 'ceilometer-api':
+      ensure => 'stopped',
+      name   => $::ceilometer::params::api_service_name,
+      enable => false,
+      tag    => 'ceilometer-service',
+    }
+    Class['ceilometer::db'] -> Service[$service_name]
+  } else {
+    fail('Invalid service_name. Either keystone/openstack-ceilometer-api for running as a standalone service, or httpd for being run by a httpd server')
   }
 
   ceilometer_config {