Bump to latest masters

Update apache to 9c1047d

9c1047d Merge pull request #1226 from DavidS/MODULES-2655-fix-sslprotocol-test
72df6f3 (MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real
3c953de Merge pull request #1225 from DavidS/multiple-fixes
1d46f7b (MODULES-2655) fix acceptance tests to correctly detect SELinux
94b2f0f (MODULES-2680) fix default nodeset to actually work
a2a6395 Merge pull request #1218 from damonconway/2673
680f3a9 (MODULES-2673) Adding dev_packages to apache class. Allows use of httpd24u-devel from the IUS repo.
6124598 Merge pull request #1224 from DavidS/allow_no_docroot
b63aac2 (MAINT) add a small test for no-docroot-mode
3a1a4e4 Merge pull request #1216 from bmfurtado/MODULES-2655
bb5b27e Added tests and updated docs for string and array support on ssl_protocol for apache::vhost.
f57f7f7 (MODULES-2120) Allow empty docroot
d57816b Added support for both string and array on ssl_protocol for apache::vhost
8447589 Change SSLProtocol in apache::vhost to be space separated

Update cinder to f7524dac1bab750db82a341d0fb61ba0cc7179d7

f7524dac1bab750db82a341d0fb61ba0cc7179d7 Merge "Specify a dedicated keystone user for cinderv2"
43dcec66ba41ebac2895159e7dea3cb1d4cae498 Merge "Put all the logging related parameters to the logging class"
18f2db7a1def9322a7b6b8693f5c84eafe988eff Specify a dedicated keystone user for cinderv2
d0b0f897f1ac3e1e030901ffcde2d9cf93f098d4 Merge "Remove deprecated mysql_module"
7fe7d77bf3010a1e9c6559e5435c72ed6ff4190e Put all the logging related parameters to the logging class
6e192209432e0a9a8bc2d4b9032fb5a93844bc1b Remove deprecated mysql_module

Update firewall to 2d870c46e95850ff6ee8bda19f48381512be1af7

2d870c46e95850ff6ee8bda19f48381512be1af7 Merge pull request #574 from DavidS/fix-selinux
55c838db80688edf63f0e70dcf2b755885b4a3f8 (MAINT) RedHat 6 also uses unconfined_t

Update glance to 3ffcc382d0ed3e3cd441830d59965dd62a2be7e0

3ffcc382d0ed3e3cd441830d59965dd62a2be7e0 Merge "Remove deprecated mysql_module"
26cbd53d991b4bbfcae1f354ab5cc16908185a3e Remove deprecated mysql_module

Update haproxy to 1c218e6fca7c217a94bc6046381bd4d6449223a4

1c218e6fca7c217a94bc6046381bd4d6449223a4 Merge pull request redhat-openstack#201 from traylenator/config_file
fe6fcb1059a482587f8a8be4a010cf31ad4f92f7 (MODULES-2704) Consistent use of ::haproxy::config_file

Update heat to f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d

f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d Missing domain in keystone::domain

Update ironic to 93018353468db291aa79b30656df85cfe4dee554

93018353468db291aa79b30656df85cfe4dee554 Merge "Simplify rpc_backend parameter"
8724c8f4a27e3e30fbae1e3dd1edfb573ffb652d Simplify rpc_backend parameter

Update keystone to 93af53da67370bc52b4f42ac08f6c5963ce7bb4e

93af53da67370bc52b4f42ac08f6c5963ce7bb4e Merge "Federation acceptance: bump packages to latest"
d2c44f731caa1ac3e57c407fc63c0c790e99e43f Replace indirection calls
a88ede3fe156e8057bb237f30926a5996dce7a82 Federation acceptance: bump packages to latest

Update manila to 3122525fe061364450e2e37cb293d24b2a3f2e5c

3122525fe061364450e2e37cb293d24b2a3f2e5c Merge "Put all the logging related parameters to the logging class"
0fa8d193d4b3ea8a6bf7ce379f6d703e01210960 Put all the logging related parameters to the logging class

Update mysql to 87b7e4de9cdc5feae49015c1d829e2e74f6c355b

87b7e4de9cdc5feae49015c1d829e2e74f6c355b Merge pull request #766 from DavidS/modules-2683-fix-root-password-hiding
5f49c45b2eab1a655b1547397806dd024ee82b5e (MODULES-2683) fix version compare to properly suppress show_diff for root password
6527a3aa22a79eb8a7fb554c9ddee7e53f4e534f (MAINT) switch to rspec-puppet-facts

Update neutron to 4b08d26f2f5a7d5f382b80a4631d7cca878f8a17

4b08d26f2f5a7d5f382b80a4631d7cca878f8a17 Merge "Delete namespaces by default"
3a1b5bec8bd4b25c0424c4bab0b0ec959d98c9b4 Merge "disable third-party software management"
4408e648f48ef8b500aa1a35018081623051c6f8 Delete namespaces by default
46a84300df5b7dda1d811a969f7660b818eeb6be Merge "dbsync should only notify services that use the db"
b9a1f479cfac84c98fa96b0ffabe08a9e847c03b disable third-party software management
fdf49deed8d64cea83b079b79d13d89df49926e3 dbsync should only notify services that use the db

Update redis to 4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed

4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed Add a option to override the service provider

Update stdlib to 2db7440

2db7440 Merge pull request #538 from mmckinst/bool2str_enhance
6de1a6e add functionality to bool2str to return strings of your choice for a boolean
39126a7 Merge pull request #539 from mentat/MODULES-2696
6aa7f2d Add check to ensure regex does not throw for none type.
57a8485 Merge pull request #537 from cmurphy/fix_load_module_metadata
25410c4 Let load_module_metadata succeed on empty file
0f8df10 Rename load_module_metadata test path
5b3c623 Merge pull request #536 from DavidS/improve-file_line-docs
ad173f2 (MODULES-2421) improve description of file_line

Update trove to 03f5a793a63e3788d92bda067b1b342a07db3ff7

03f5a793a63e3788d92bda067b1b342a07db3ff7 Simplify rpc_backend parameter

Update vcsrepo to 99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a

99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a Merge pull request redhat-openstack#273 from hunner/fix_trustcert
bf0f40ae4efa9095ca9a877acefdb781e1fbf1cd Fix :false to be default value

Change-Id: I505e156a08c157a536ba0c922a2ef90083bbf10e

Puppetfile

@@ -1,5 +1,5 @@
 mod 'apache',
-  :commit => '22ed02711ea7afee8a17c6b0ab7eb24d772d2b6e',
+  :commit => '9c1047da1d7672d5e7305844eb27282adf60bbe0',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
@@ -19,7 +19,7 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '17026a35ecc28e28075bc13580b9740d641094ac',
+  :commit => 'f7524dac1bab750db82a341d0fb61ba0cc7179d7',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -35,15 +35,15 @@ mod 'corosync',
   :git => 'https://github.com/puppetlabs/puppetlabs-corosync.git'
 
 mod 'firewall',
-  :commit => '6755b959004f176844cb143690cc83ba621c40de',
+  :commit => '2d870c46e95850ff6ee8bda19f48381512be1af7',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => '26016bc260b6d1101201dd1ca791deb1a5fcf2cf',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => 'd6ad1f504eda3f1f0e0613ece9392dd8f78bf7b5',
+  :commit => '3ffcc382d0ed3e3cd441830d59965dd62a2be7e0',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
@@ -55,11 +55,11 @@ mod 'gnocchi',
   :git => 'https://github.com/openstack/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => 'cdcbc19ac3389aadc5d7ec1e9d0631de28e06bf7',
+  :commit => '1c218e6fca7c217a94bc6046381bd4d6449223a4',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '06953c3d4493e405343704b1beeb1e610cfa75e6',
+  :commit => 'f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
@@ -75,19 +75,19 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '50ec0e11608930f5286ee0913d1cd6fde8bf8a55',
+  :commit => '93018353468db291aa79b30656df85cfe4dee554',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => 'cc2f08164aea815c8e6f1a849edfee6aa75f7dcc',
+  :commit => '93af53da67370bc52b4f42ac08f6c5963ce7bb4e',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'manila',
-  :commit => 'd8fee807df66314ee3e5c68ee669e8826e327eef',
+  :commit => '3122525fe061364450e2e37cb293d24b2a3f2e5c',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
@@ -107,7 +107,7 @@ mod 'mongodb',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => '5e6db0bb0fd8b28bb9c7d8f23e67e6ddb8abf616',
+  :commit => '87b7e4de9cdc5feae49015c1d829e2e74f6c355b',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
@@ -119,7 +119,7 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'ee10d14987a96fb82cc0905827f7891e8e6ecbb8',
+  :commit => '4b08d26f2f5a7d5f382b80a4631d7cca878f8a17',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
@@ -159,7 +159,7 @@ mod 'rabbitmq',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
-  :commit => 'df4e2077220b13751c6f4fa89e714c0be72a65a7',
+  :commit => '4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed',
   :git => 'https://github.com/arioch/puppet-redis.git'
 
 mod 'remote',
@@ -187,7 +187,7 @@ mod 'staging',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '4e62223801d118bb427a230b4571a911399ea859',
+  :commit => '2db7440c6798d3ea0bf2f92c66d8281b2bfcff0c',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
@@ -211,15 +211,15 @@ mod 'tripleo',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '045d929556389a631a34a68b011dc87b960fb9a6',
+  :commit => '03f5a793a63e3788d92bda067b1b342a07db3ff7',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',
   :commit => '52120a9c64eb411c1ef51dccfc6f758f7142f6a5',
   :git => 'https://github.com/openstack/puppet-tuskar.git'
 
 mod 'vcsrepo',
-  :commit => '279be07607dd132f9446291cf1afa5ef2320632a',
+  :commit => '99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',

apache/README.md

@@ -133,6 +133,7 @@
 [`logroot`]: #logroot
 [Log security]: http://httpd.apache.org/docs/current/logs.html#security
 
+[`manage_docroot`]: #manage_docroot
 [`manage_user`]: #manage_user
 [`manage_group`]: #manage_group
 [`MaxConnectionsPerChild`]: https://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild
@@ -888,6 +889,20 @@ Configures a default virtual host when the class is declared. Valid options: Boo
 
 To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'.
 
+##### `dev_packages`
+
+Configures a specific dev package to use. Valid options: String.  Default: 'OS default httpd dev package'.
+
+Example for using httpd 2.4 from the IUS yum repo:
+
+~~~ puppet
+include ::apache::dev
+class { 'apache':
+  apache_name  => 'httpd24u',
+  dev_packages => 'httpd24u-devel',
+}
+~~~
+
 ##### `docroot`
 
 Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system.
@@ -1886,6 +1901,8 @@ Sets the list of resources to look for when a client requests an index of the di
 
 **Required**. Sets the [`DocumentRoot`][] location, from which Apache serves files.
 
+If `docroot` and [`manage_docroot`][] are both set to `false`, no [`DocumentRoot`][] will be set and the accompanying `<Directory /path/to/directory>` block will not be created.
+
 ##### `docroot_group`
 
 Sets group access to the [`docroot`][] directory. Defaults to 'root'.
@@ -3046,7 +3063,7 @@ Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/ce
 
 ##### `ssl_protocol`
 
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
+Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Expects an array or space separated string of accepted protocols. Defaults to 'all', '-SSLv2', '-SSLv3'.
 
 ##### `ssl_cipher`
 

apache/manifests/dev.pp

@@ -1,6 +1,6 @@
 class apache::dev {
   include ::apache::params
-  $packages = $::apache::params::dev_packages
+  $packages = $::apache::dev_packages
   if $packages { # FreeBSD doesn't have dev packages to install
     package { $packages:
       ensure  => present,

apache/manifests/init.pp

@@ -28,6 +28,7 @@
   $default_ssl_crl        = undef,
   $default_ssl_crl_check  = undef,
   $default_type           = 'none',
+  $dev_packages           = $::apache::params::dev_packages,
   $ip                     = undef,
   $service_enable         = true,
   $service_manage         = true,

apache/manifests/vhost.pp

@@ -227,6 +227,12 @@
   if $limit_request_field_size {
     validate_integer($limit_request_field_size)
   }
+
+  # Validate the docroot as a string if:
+  # - $manage_docroot is true
+  if $manage_docroot {
+    validate_string($docroot)
+  }
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -271,7 +277,7 @@
 
   # This ensures that the docroot exists
   # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) and $manage_docroot {
+  if $manage_docroot and $docroot and ! defined(File[$docroot]) {
     file { $docroot:
       ensure  => directory,
       owner   => $docroot_owner,
@@ -443,7 +449,7 @@
       fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
     }
     $_directories = $directories
-  } else {
+  } elsif $docroot {
     $_directory = {
       provider       => 'directory',
       path           => $docroot,
@@ -518,10 +524,12 @@
   # Template uses:
   # - $virtual_docroot
   # - $docroot
-  concat::fragment { "${name}-docroot":
-    target  => "${priority_real}${filename}.conf",
-    order   => 10,
-    content => template('apache/vhost/_docroot.erb'),
+  if $docroot {
+    concat::fragment { "${name}-docroot":
+      target  => "${priority_real}${filename}.conf",
+      order   => 10,
+      content => template('apache/vhost/_docroot.erb'),
+    }
   }
 
   # Template uses:

apache/spec/acceptance/apache_parameters_spec.rb

@@ -358,7 +358,7 @@ class { 'apache':
     describe 'setup' do
       it 'applies cleanly' do
         pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::selinux {
+          if $::osfamily == 'RedHat' and "$::selinux" == "true" {
             $semanage_package = $::operatingsystemmajrelease ? {
               '5'     => 'policycoreutils',
               default => 'policycoreutils-python',

apache/spec/acceptance/class_spec.rb

@@ -45,7 +45,7 @@ class { 'apache': }
     # Using puppet_apply as a helper
     it 'should work with no errors' do
       pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::selinux {
+      if $::osfamily == 'RedHat' and "$::selinux" == "true" {
         $semanage_package = $::operatingsystemmajrelease ? {
           '5'     => 'policycoreutils',
           default => 'policycoreutils-python',

apache/spec/acceptance/nodesets/default.yml

@@ -1,10 +1,9 @@
 HOSTS:
-  centos-64-x64:
+  centos-66-x64:
     roles:
       - master
     platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    box : puppetlabs/centos-6.6-64-nocm
     hypervisor : vagrant
 CONFIG:
   log_level: debug

apache/spec/acceptance/vhost_spec.rb

@@ -1287,7 +1287,7 @@ class { 'apache::mod::fastcgi': }
   describe 'additional_includes' do
     it 'applies cleanly' do
       pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::selinux {
+        if $::osfamily == 'RedHat' and "$::selinux" == "true" {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
             default => 'policycoreutils-python',
@@ -1339,4 +1339,33 @@ class { 'apache': }
       it { is_expected.to be_file }
     end
   end
+
+  describe 'SSLProtocol directive' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        apache::vhost { 'test.server':
+          docroot      => '/tmp',
+          ssl          => true,
+          ssl_protocol => ['All', '-SSLv2'],
+        }
+        apache::vhost { 'test2.server':
+          docroot      => '/tmp',
+          ssl          => true,
+          ssl_protocol => 'All -SSLv2',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
+    end
+
+    describe file("#{$vhost_dir}/25-test2.server.conf") do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'SSLProtocol  *All -SSLv2' }
+    end
+  end
 end

apache/spec/defines/vhost_spec.rb

@@ -612,6 +612,16 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
+    context 'when not setting nor managing the docroot' do
+      let :params do
+        {
+          'docroot'                     => false,
+          'manage_docroot'              => false,
+        }
+      end
+      it { is_expected.to compile }
+      it { is_expected.not_to contain_concat__fragment('rspec.example.com-docroot') }
+    end
   end
   describe 'access logs' do
     let :facts do

apache/templates/vhost/_docroot.erb

@@ -2,6 +2,6 @@
   ## Vhost docroot
 <% if @virtual_docroot -%>
   VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% else -%>
+<% elsif @docroot -%>
   DocumentRoot "<%= @docroot %>"
 <% end -%>

apache/templates/vhost/_ssl.erb

@@ -26,7 +26,7 @@
   SSLProxyEngine On
   <%- end -%>
   <%- if @ssl_protocol -%>
-  SSLProtocol             <%= @ssl_protocol %>
+  SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
   <%- end -%>
   <%- if @ssl_cipher -%>
   SSLCipherSuite          <%= @ssl_cipher %>