Merge "Adding key_size option on the certmonger_certificate function"

Puppetfile_extras

@@ -35,7 +35,7 @@ mod 'fdio',
 
 mod 'certmonger',
   :git => 'https://github.com/saltedsignal/puppet-certmonger',
-  :ref => 'v1.1.1'
+  :ref => 'v2.6.0'
 
 mod 'ptp',
   :git => 'https://github.com/redhat-nfvpe/ptp',

manifests/certmonger/ceph_dashboard.pp

@@ -39,6 +39,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ceph_dashboard (
   $hostname,
   $service_certificate,
@@ -46,6 +50,7 @@ class tripleo::certmonger::ceph_dashboard (
   $postsave_cmd = undef,
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $principal     = undef,
+  $key_size      = 2048,
 ) {
 
   ensure_resource('file', '/usr/bin/certmonger-dashboard-refresh.sh', {
@@ -64,6 +69,7 @@ class tripleo::certmonger::ceph_dashboard (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ceph_grafana.pp

@@ -39,6 +39,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ceph_grafana (
   $hostname,
   $service_certificate,
@@ -46,6 +50,7 @@ class tripleo::certmonger::ceph_grafana (
   $postsave_cmd = undef,
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $principal     = undef,
+  $key_size      = 2048,
 ) {
 
   ensure_resource('file', '/usr/bin/certmonger-grafana-refresh.sh', {
@@ -64,6 +69,7 @@ class tripleo::certmonger::ceph_grafana (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ceph_rgw.pp

@@ -42,6 +42,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ceph_rgw (
   $hostname,
   $service_certificate,
@@ -50,6 +54,7 @@ class tripleo::certmonger::ceph_rgw (
   $postsave_cmd = undef,
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $principal     = undef,
+  $key_size      = 2048,
 ) {
 
   ensure_resource('file', '/usr/bin/certmonger-rgw-refresh.sh', {
@@ -68,6 +73,7 @@ class tripleo::certmonger::ceph_rgw (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/etcd.pp

@@ -44,6 +44,10 @@
 #   (Optional) The haproxy service principal that is set for etcd in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::etcd (
   $hostname,
   $service_certificate,
@@ -52,6 +56,7 @@ class tripleo::certmonger::etcd (
   $dnsnames      = $hostname,
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -70,6 +75,7 @@ class tripleo::certmonger::etcd (
     dnsname      => $dnsnames,
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
+    key_size     => $key_size,
     ca           => $certmonger_ca,
     wait         => true,
     require      => Class['::certmonger'],

manifests/certmonger/haproxy.pp

@@ -48,6 +48,10 @@
 #   The post-save-command that certmonger will use once it renews the
 #   certificate.
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 define tripleo::certmonger::haproxy (
   $service_pem,
   $service_certificate,
@@ -57,6 +61,7 @@ define tripleo::certmonger::haproxy (
   $dnsnames      = undef,
   $principal     = undef,
   $postsave_cmd  = undef,
+  $key_size      = 2048,
 ){
     include certmonger
     include haproxy::params
@@ -103,6 +108,7 @@ define tripleo::certmonger::haproxy (
       keyfile      => $service_key,
       postsave_cmd => $postsave_cmd,
       principal    => $principal_real,
+      key_size     => $key_size,
       eku          => ['id-kp-clientAuth', 'id-kp-serverAuth'],
       wait         => true,
       tag          => 'haproxy-cert',

manifests/certmonger/httpd.pp

@@ -44,6 +44,10 @@
 # [*principal*]
 #   The haproxy service principal that is set for HAProxy in kerberos.
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 define tripleo::certmonger::httpd (
   $hostname,
   $service_certificate,
@@ -52,6 +56,7 @@ define tripleo::certmonger::httpd (
   $dnsnames      = undef,
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
   include apache::params
@@ -71,6 +76,7 @@ define tripleo::certmonger::httpd (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     tag          => 'apache-cert',
     require      => Class['::certmonger'],

manifests/certmonger/libvirt.pp

@@ -40,6 +40,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 define tripleo::certmonger::libvirt (
   $hostname,
   $service_certificate,
@@ -47,6 +51,7 @@ define tripleo::certmonger::libvirt (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
   include nova::params
@@ -61,6 +66,7 @@ define tripleo::certmonger::libvirt (
     principal    => $principal,
     postsave_cmd => $postsave_cmd_real,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     tag          => 'libvirt-cert',
     require      => Class['::certmonger'],

manifests/certmonger/libvirt_vnc.pp

@@ -48,6 +48,10 @@
 #   (Optional) Service to reload when certificate is created/renewed
 #   Defaults to $::nova::params::libvirt_service_name
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 define tripleo::certmonger::libvirt_vnc (
   $hostname,
   $service_certificate,
@@ -57,6 +61,7 @@ define tripleo::certmonger::libvirt_vnc (
   $principal        = undef,
   $cacertfile       = undef,
   $notify_service   = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
   include nova::params
@@ -74,6 +79,7 @@ define tripleo::certmonger::libvirt_vnc (
     principal    => $principal,
     postsave_cmd => $postsave_cmd_real,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     cacertfile   => $cacertfile,
     wait         => true,
     tag          => 'libvirt-cert',

manifests/certmonger/memcached.pp

@@ -40,6 +40,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::memcached (
   $hostname,
   $service_certificate,
@@ -47,6 +51,7 @@ class tripleo::certmonger::memcached (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = '/usr/bin/certmonger-memcached-refresh.sh',
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -66,6 +71,7 @@ class tripleo::certmonger::memcached (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/metrics_qdr.pp

@@ -40,6 +40,10 @@
 #   (Optional) The haproxy service principal that is set for metrics_qdr in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::metrics_qdr (
   $hostname,
   $service_certificate,
@@ -47,6 +51,7 @@ class tripleo::certmonger::metrics_qdr (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
   include qdr::params
@@ -67,6 +72,7 @@ class tripleo::certmonger::metrics_qdr (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/mysql.pp

@@ -46,6 +46,10 @@
 #   (Optional) The haproxy service principal that is set for MySQL in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::mysql (
   $hostname,
   $service_certificate,
@@ -54,6 +58,7 @@ class tripleo::certmonger::mysql (
   $dnsnames      = $hostname,
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -66,6 +71,7 @@ class tripleo::certmonger::mysql (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/neutron.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::neutron (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::neutron (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -64,6 +69,7 @@ class tripleo::certmonger::neutron (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/neutron_ovn.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::neutron_ovn (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::neutron_ovn (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -57,6 +62,7 @@ class tripleo::certmonger::neutron_ovn (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/novnc_proxy.pp

@@ -42,6 +42,9 @@
 # [*notify_service*]
 #   (Optional) Service to reload when certificate is created/renewed
 #   Defaults to $::nova::params::libvirt_service_name
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
 #
 class tripleo::certmonger::novnc_proxy (
   $hostname,
@@ -50,6 +53,7 @@ class tripleo::certmonger::novnc_proxy (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $notify_service   = undef,
   $postsave_cmd  = undef,
+  $key_size      = 2048,
   $principal     = undef,
 ) {
   include certmonger
@@ -73,6 +77,7 @@ class tripleo::certmonger::novnc_proxy (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     tag          => 'novnc-proxy',
     require      => Class['::certmonger'],

manifests/certmonger/openvswitch.pp

@@ -39,6 +39,10 @@
 #   (Optional) The haproxy service principal that is set for openvswitch in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::openvswitch (
   $hostname,
   $service_certificate,
@@ -46,6 +50,7 @@ class tripleo::certmonger::openvswitch (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = 'systemctl reload openvswitch',
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -58,6 +63,7 @@ class tripleo::certmonger::openvswitch (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ovn_controller.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ovn_controller (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::ovn_controller (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -57,6 +62,7 @@ class tripleo::certmonger::ovn_controller (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ovn_dbs.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ovn_dbs (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::ovn_dbs (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -57,6 +62,7 @@ class tripleo::certmonger::ovn_dbs (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ovn_metadata.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ovn_metadata (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::ovn_metadata (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -57,6 +62,7 @@ class tripleo::certmonger::ovn_metadata (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/ovn_octavia.pp

@@ -38,6 +38,10 @@
 #   (Optional) The haproxy service principal that is set for neutron in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::ovn_octavia (
   $hostname,
   $service_certificate,
@@ -45,6 +49,7 @@ class tripleo::certmonger::ovn_octavia (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -57,6 +62,7 @@ class tripleo::certmonger::ovn_octavia (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/qemu.pp

@@ -43,6 +43,10 @@
 #   (Optional) Specifies that path to write the CA cerftificate to.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 define tripleo::certmonger::qemu (
   $hostname,
   $service_certificate,
@@ -51,6 +55,7 @@ define tripleo::certmonger::qemu (
   $cacertfile    = undef,
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
   include nova::params
@@ -64,6 +69,7 @@ define tripleo::certmonger::qemu (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     cacertfile   => $cacertfile,
     wait         => true,
     tag          => 'qemu-cert',

manifests/certmonger/rabbitmq.pp

@@ -39,6 +39,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::rabbitmq (
   $hostname,
   $service_certificate,
@@ -46,6 +50,7 @@ class tripleo::certmonger::rabbitmq (
   $certmonger_ca = hiera('certmonger_ca', 'local'),
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -65,6 +70,7 @@ class tripleo::certmonger::rabbitmq (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }

manifests/certmonger/redis.pp

@@ -45,6 +45,10 @@
 #   (Optional) The service principal that is set for the service in kerberos.
 #   Defaults to undef
 #
+# [*key_size*]
+#   (Optional) Specifies the private key size used when creating the certificate.
+#   Defaults to 2048bits.
+#
 class tripleo::certmonger::redis (
   $hostname,
   $service_certificate,
@@ -53,6 +57,7 @@ class tripleo::certmonger::redis (
   $dnsnames      = $hostname,
   $postsave_cmd  = undef,
   $principal     = undef,
+  $key_size      = 2048,
 ) {
   include certmonger
 
@@ -72,6 +77,7 @@ class tripleo::certmonger::redis (
     principal    => $principal,
     postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
+    key_size     => $key_size,
     wait         => true,
     require      => Class['::certmonger'],
   }