Merge "Ensure directory exists for certificates for haproxy"

manifests/certmonger/haproxy.pp

@@ -84,6 +84,7 @@ define tripleo::certmonger::haproxy (
       postsave_cmd => $postsave_cmd,
       principal    => $principal,
       wait         => true,
+      tag          => 'haproxy-cert',
       require      => Class['::certmonger'],
     }
     concat { $service_pem :
@@ -91,12 +92,14 @@ define tripleo::certmonger::haproxy (
       mode    => '0640',
       owner   => 'haproxy',
       group   => 'haproxy',
+      tag     => 'haproxy-cert',
       require => Package[$::haproxy::params::package_name],
     }
     concat::fragment { "${title}-cert-fragment":
       target  => $service_pem,
       source  => $service_certificate,
       order   => '01',
+      tag     => 'haproxy-cert',
       require => Certmonger_certificate["${title}-cert"],
     }
 
@@ -106,6 +109,7 @@ define tripleo::certmonger::haproxy (
         target  => $service_pem,
         source  => $ca_pem,
         order   => '10',
+        tag     => 'haproxy-cert',
         require => Class['tripleo::certmonger::ca::local'],
       }
     }
@@ -114,6 +118,7 @@ define tripleo::certmonger::haproxy (
       target  => $service_pem,
       source  => $service_key,
       order   => 20,
+      tag     => 'haproxy-cert',
       require => Certmonger_certificate["${title}-cert"],
     }
 }

manifests/certmonger/haproxy_dirs.pp

@@ -0,0 +1,55 @@
+# Copyright 2017 Red Hat, Inc.
+#
+# Licensed under the haproxy License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.haproxy.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# : = Class: tripleo::certmonger::haproxy_dirs
+#
+# Creates the necessary directories for haproxy's certificates and keys in the
+# assigned locations if specified. It also assigns the correct SELinux tags.
+#
+# === Parameters:
+#
+# [*certificate_dir*]
+#   (Optional) Directory where haproxy's certificates will be stored. If left
+#   unspecified, it won't be created.
+#   Defaults to undef
+#
+# [*key_dir*]
+#   (Optional) Directory where haproxy's keys will be stored.
+#   Defaults to undef
+#
+class tripleo::certmonger::haproxy_dirs(
+  $certificate_dir = undef,
+  $key_dir         = undef,
+){
+
+  if $certificate_dir {
+    file { $certificate_dir :
+      ensure  => 'directory',
+      selrole => 'object_r',
+      seltype => 'cert_t',
+      seluser => 'system_u',
+    }
+    File[$certificate_dir] ~> Certmonger_certificate<| tag == 'haproxy-cert' |>
+  }
+
+  if $key_dir {
+    file { $key_dir :
+      ensure  => 'directory',
+      selrole => 'object_r',
+      seltype => 'cert_t',
+      seluser => 'system_u',
+    }
+    File[$key_dir] ~> Certmonger_certificate<| tag == 'haproxy-cert' |>
+  }
+}

manifests/profile/base/certmonger_user.pp

@@ -98,6 +98,7 @@ class tripleo::profile::base::certmonger_user (
     ensure_resources('tripleo::certmonger::libvirt', $libvirt_certificates_specs)
   }
   unless empty($haproxy_certificates_specs) {
+    include ::tripleo::certmonger::haproxy_dirs
     ensure_resources('tripleo::certmonger::haproxy', $haproxy_certificates_specs)
     # The haproxy fronends (or listen resources) depend on the certificate
     # existing and need to be refreshed if it changed.