Merge pull request #145 from xbezdick/master

Update openstack modules to their latest master

Puppetfile

@@ -3,15 +3,15 @@ mod 'apache',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'ceilometer',
-  :commit => 'c0bf61c0d70a04f77b9c7fdf2211bf36bda12a78',
+  :commit => '1d78470e5023e2ca6adef47c904d14d046dd87d1',
   :git => 'https://github.com/stackforge/puppet-ceilometer.git'
 
 mod 'certmonger',
   :commit => '3f86b9973fc30c14a066b0f215023d5f1398b874',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => 'c79a2a2c3a8fa3b2ae252f01c912939f996b4c1b',
+  :commit => 'b5dce39754ed6857d6dc87b3ae29ed38057a487e',
   :git => 'https://github.com/stackforge/puppet-cinder.git'
 
 mod 'common',
@@ -23,15 +23,15 @@ mod 'concat',
   :git => 'https://github.com/puppetlabs/puppetlabs-concat.git'
 
 mod 'firewall',
-  :commit => 'f061452461c841e83f20df1f9dd0aea485fb9744',
+  :commit => '6b308177c3d279083078955942969c92b145eba0',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => 'a63ab112aabdc9faa5e66fc095ef9dcc865d6999',
   :git => 'https://github.com/rohara/puppet-galera.git'
 
 mod 'glance',
-  :commit => 'a03acf54bf3163fc068196a6d4d62a5605ab4965',
+  :commit => '916a90ebdc3e9fafe956b12dcaa0e0ce3e7e3f04',
   :git => 'https://github.com/stackforge/puppet-glance.git'
 
 mod 'gluster',
@@ -43,11 +43,11 @@ mod 'haproxy',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => 'c24fe25cd197b8d83d9dc1d6671a0499bb85e7ed',
+  :commit => '45a35dc2ec5f01bd79189ada881d083e1a51413b',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '3fdd86e61471e9b7503d0e23f38c7fd4efa94267',
+  :commit => '351c711004ccd9815e9a0d153bc5452461f7852d',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',
@@ -87,11 +87,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '340abcde440038d166e0fc3dd5d11f74f478f5d6',
+  :commit => '663b4b16d22f78dbbb89c58170690a3c0a1e0ff2',
   :git => 'https://github.com/stackforge/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'aa578ae78b3937c23fb026c7304d92e1d808ffbd',
+  :commit => '261ae911fc5c325f6dd739a9b05f508a80a25034',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
@@ -107,7 +107,7 @@ mod 'openstack',
   :git => 'https://github.com/stackforge/puppet-openstack.git'
 
 mod 'openstacklib',
-  :commit => 'bfbe779b17a9d53b26f1d246d35d44b29637f0ce',
+  :commit => '2fc2e5504de7c298263a1d63af92974a7779d5c9',
   :git => 'https://github.com/stackforge/puppet-openstacklib.git'
 
 mod 'pacemaker',

ceilometer/manifests/policy.pp

@@ -18,11 +18,12 @@
   $policy_path = '/etc/ceilometer/policy.json',
 ) {
 
+  validate_hash($policies)
+
   Openstacklib::Policy::Base {
     file_path => $policy_path,
   }
-  class { 'openstacklib::policy' :
-    policies => $policies,
-  }
+
+  create_resources('openstacklib::policy::base', $policies)
 
 }

ceilometer/spec/classes/ceilometer_policy_spec.rb

@@ -16,8 +16,9 @@
     end
 
     it 'set up the policies' do
-      should contain_class('openstacklib::policy').with({
-        :policies => params[:policies]
+      should contain_openstacklib__policy__base('context_is_admin').with({
+        :key   => 'context_is_admin',
+        :value => 'foo:bar'
       })
     end
   end

cinder/manifests/policy.pp

@@ -18,11 +18,12 @@
   $policy_path = '/etc/cinder/policy.json',
 ) {
 
+  validate_hash($policies)
+
   Openstacklib::Policy::Base {
     file_path => $policy_path,
   }
-  class { 'openstacklib::policy' :
-    policies => $policies,
-  }
+
+  create_resources('openstacklib::policy::base', $policies)
 
 }

cinder/spec/classes/cinder_policy_spec.rb

@@ -16,8 +16,9 @@
     end
 
     it 'set up the policies' do
-      should contain_class('openstacklib::policy').with({
-        :policies => params[:policies]
+      should contain_openstacklib__policy__base('context_is_admin').with({
+        :key   => 'context_is_admin',
+        :value => 'foo:bar'
       })
     end
   end

firewall/CHANGELOG.md

@@ -1,3 +1,26 @@
+##2014-11-04 - Supported Release 1.2.0
+###Summary
+
+This release has a number of new features and bugfixes, including rule inversion, future parser support, improved EL7 support, and the ability to purge ip6tables rules.
+
+####Features
+- Documentation updates!
+- Test updates!
+- Add ipset support
+- Enable rule inversion
+- Future parser support
+- Improved support for EL7
+- Support netfilter-persistent
+- Add support for statistics module
+- Add support for mac address source rules
+- Add cbt protocol
+
+####Bugfixes
+- Incorrect use of `source => :iptables` in the ip6tables provider was making it impossible to purge ip6tables rules (MODULES-41)
+- Don't require `toports` when `jump => 'REDIRECT'` (MODULES-1086)
+- Don't limit which chains iniface and outiface parameters can be used in
+- Don't fail on rules added with ipsec/strongswan (MODULES-796)
+
 ##2014-07-08 - Supported Release 1.1.3
 ###Summary
 This is a supported release with test coverage enhancements.

firewall/manifests/linux/redhat.pp

@@ -22,9 +22,10 @@
   # lib/puppet/util/firewall.rb.
   if   ($::operatingsystem != 'Fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0)
     or ($::operatingsystem == 'Fedora' and versioncmp($::operatingsystemrelease, '15') >= 0) {
-    package { 'firewalld':
-      ensure  => absent,
-      before  => Package['iptables-services'],
+    service { "firewalld":
+      ensure => stopped,
+      enable => false,
+      before => Package['iptables-services']
     }
 
     package { 'iptables-services':

firewall/metadata.json

@@ -1,12 +1,12 @@
 {
   "name": "puppetlabs-firewall",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "author": "Puppet Labs",
   "summary": "Manages Firewalls such as iptable",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-firewall",
-  "project_page": "http://forge.puppetlabs.com/puppetlabs/firewall",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-firewall/issues",
+  "project_page": "http://github.com/puppetlabs/puppetlabs-firewall",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

firewall/spec/acceptance/purge_spec.rb

@@ -130,7 +130,7 @@ class { 'firewall': }
       expect(shell('iptables-save').stdout).to match(/-A INPUT -s 1\.2\.1\.1(\/32)? -p tcp\s?\n-A INPUT -s 1\.2\.1\.1(\/32)? -p udp/)
     end
   end
-  context('ipv6 chain purge') do
+  context 'ipv6 chain purge', :unless => (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5') do
     after(:all) do
       ip6tables_flush_all_tables
     end

firewall/spec/unit/classes/firewall_linux_redhat_spec.rb

@@ -12,7 +12,7 @@
           :operatingsystemrelease => osrel
         }}
 
-        it { should_not contain_package('firewalld') }
+        it { should_not contain_service('firewalld') }
         it { should_not contain_package('iptables-services') }
       end
     end
@@ -24,8 +24,9 @@
           :operatingsystemrelease => osrel
         }}
 
-        it { should contain_package('firewalld').with(
-          :ensure => 'absent',
+        it { should contain_service('firewalld').with(
+          :ensure => 'stopped',
+          :enable => false,
           :before => 'Package[iptables-services]'
         )}
 

glance/manifests/api.pp

@@ -232,6 +232,7 @@
   Glance_api_config<||>   ~> Service['glance-api']
   Glance_cache_config<||> ~> Service['glance-api']
   Class['glance::policy'] ~> Service['glance-api']
+  Service['glance-api']   ~> Glance_image<||>
 
   File {
     ensure  => present,

glance/manifests/policy.pp

@@ -18,11 +18,12 @@
   $policy_path = '/etc/glance/policy.json',
 ) {
 
+  validate_hash($policies)
+
   Openstacklib::Policy::Base {
     file_path => $policy_path,
   }
-  class { 'openstacklib::policy' :
-    policies => $policies,
-  }
+
+  create_resources('openstacklib::policy::base', $policies)
 
 }

glance/spec/classes/glance_policy_spec.rb

@@ -16,8 +16,9 @@
     end
 
     it 'set up the policies' do
-      should contain_class('openstacklib::policy').with({
-        :policies => params[:policies]
+      should contain_openstacklib__policy__base('context_is_admin').with({
+        :key   => 'context_is_admin',
+        :value => 'foo:bar'
       })
     end
   end

heat/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', '~> 0.3.2'
+  gem 'puppet-lint', '~> 1.1'
+  gem 'puppet-lint-param-docs', '1.1.0'
   gem 'rake', '10.1.1'
 end
 

heat/manifests/api-cfn.pp

@@ -1,5 +1,38 @@
+# == Class: heat::api-cfn
+#
+# WARNING: Deprecated class. Use heat::api_cfn instead !
 # Installs & configure the heat CloudFormation API service
 #
+# === Parameters
+# [*enabled*]
+#   (Optional) Should the service be enabled.
+#   Defaults to 'true'.
+#
+# [*keystone_host*]
+#
+# [*keystone_port*]
+#
+# [*keystone_protocol*]
+#
+# [*keystone_user*]
+#
+# [*keystone_tenant*]
+#
+# [*keystone_password*]
+#
+# [*keystone_ec2_uri*]
+#
+# [*auth_uri*]
+#
+# [*bind_host*]
+#
+# [*bind_port*]
+#
+# [*verbose*]
+#
+# [*debug*]
+#
+#
 class heat::api-cfn (
   $enabled           = true,
   $keystone_host     = '127.0.0.1',

heat/manifests/api-cloudwatch.pp

@@ -1,5 +1,38 @@
+# == Class: heat::api-cloudwatch
+#
+# WARNING: Deprecated class. Use heat::api_cloudwatch instead !
 # Installs & configure the heat CloudWatch API service
 #
+# === Parameters
+# [*enabled*]
+#   (Optional) Should the service be enabled.
+#   Defaults to 'true'.
+#
+# [*keystone_host*]
+#
+# [*keystone_port*]
+#
+# [*keystone_protocol*]
+#
+# [*keystone_user*]
+#
+# [*keystone_tenant*]
+#
+# [*keystone_password*]
+#
+# [*keystone_ec2_uri*]
+#
+# [*auth_uri*]
+#
+# [*bind_host*]
+#
+# [*bind_port*]
+#
+# [*verbose*]
+#
+# [*debug*]
+#
+#
 class heat::api-cloudwatch (
   $enabled           = true,
   $keystone_host     = '127.0.0.1',

heat/manifests/api.pp

@@ -1,13 +1,46 @@
+# == Class: heat::api
+#
 # Installs & configure the heat API service
 #
-# == Parameters
-#  [*enabled*]
-#    (optional) Should the service be enabled.
-#    Defaults to true
+# === Parameters
+# [*enabled*]
+#   (optional) Should the service be enabled.
+#   Defaults to 'true'.
+#
+# [*manage_service*]
+#   (optional) Whether the service should be managed by Puppet.
+#   Defaults to 'true'.
+#
+# [*bind_host*]
+#   (Optional) Address to bind the server. Useful when
+#   selecting a particular network interface.
+#   Defaults to '0.0.0.0'.
+#
+# [*bind_port*]
+#   (Optional) The port on which the server will listen.
+#   Defaults to '8004'.
+#
+# [*workers*]
+#   (Optional) The port on which the server will listen.
+#   Defaults to '0'.
+#
+# [*use_ssl*]
+#   (Optional) Whether to use ssl or not.
+#   Defaults to 'false'.
+#
+# [*cert_file*]
+#   (Optional) Location of the SSL certificate file to use for SSL mode.
+#   Required when $use_ssl is set to 'true'.
+#   Defaults to 'false'.
+#
+# [*key_file*]
+#   (Optional) Location of the SSL key file to use for enabling SSL mode.
+#   Required when $use_ssl is set to 'true'.
+#   Defaults to 'false'.
+#
+# === Deprecated Parameters
 #
-#  [*manage_service*]
-#    (optional) Whether the service should be managed by Puppet.
-#    Defaults to true.
+# No Deprecated Parameters.
 #
 class heat::api (
   $manage_service    = true,