Adds missing Neutron TLS certificate/key generation
Neutron agents need key/certificate in order to communicate with OVS using SSL. Partial-Bug: 1746762 Change-Id: I4bbaf00f0776cab0be34d814a541fb2fd1e64326 Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
76
manifests/certmonger/neutron.pp
Normal file
76
manifests/certmonger/neutron.pp
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
# Copyright 2018 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache 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.apache.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::neutron
|
||||||
|
#
|
||||||
|
# Request a certificate for the opendaylight service and do the necessary setup.
|
||||||
|
#
|
||||||
|
# === Parameters
|
||||||
|
#
|
||||||
|
# [*hostname*]
|
||||||
|
# The hostname of the node. this will be set in the CN of the certificate.
|
||||||
|
#
|
||||||
|
# [*service_certificate*]
|
||||||
|
# The path to the certificate that will be used for TLS in this service.
|
||||||
|
#
|
||||||
|
# [*service_key*]
|
||||||
|
# The path to the key that will be used for TLS in this service.
|
||||||
|
#
|
||||||
|
# [*certmonger_ca*]
|
||||||
|
# (Optional) The CA that certmonger will use to generate the certificates.
|
||||||
|
# Defaults to hiera('certmonger_ca', 'local').
|
||||||
|
#
|
||||||
|
# [*postsave_cmd*]
|
||||||
|
# (Optional) Specifies the command to execute after requesting a certificate.
|
||||||
|
# Defaults to 'if systemctl -q is-active opendaylight; then systemctl restart opendaylight; else true; fi'
|
||||||
|
#
|
||||||
|
# [*principal*]
|
||||||
|
# (Optional) The haproxy service principal that is set for neutron in kerberos.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
|
class tripleo::certmonger::neutron (
|
||||||
|
$hostname,
|
||||||
|
$service_certificate,
|
||||||
|
$service_key,
|
||||||
|
$certmonger_ca = hiera('certmonger_ca', 'local'),
|
||||||
|
$postsave_cmd = undef,
|
||||||
|
$principal = undef,
|
||||||
|
) {
|
||||||
|
include ::certmonger
|
||||||
|
|
||||||
|
certmonger_certificate { 'neutron' :
|
||||||
|
ensure => 'present',
|
||||||
|
certfile => $service_certificate,
|
||||||
|
keyfile => $service_key,
|
||||||
|
hostname => $hostname,
|
||||||
|
dnsname => $hostname,
|
||||||
|
principal => $principal,
|
||||||
|
postsave_cmd => $postsave_cmd,
|
||||||
|
ca => $certmonger_ca,
|
||||||
|
wait => true,
|
||||||
|
require => Class['::certmonger'],
|
||||||
|
}
|
||||||
|
file { $service_certificate :
|
||||||
|
owner => 'neutron',
|
||||||
|
group => 'neutron',
|
||||||
|
require => Certmonger_certificate['neutron']
|
||||||
|
}
|
||||||
|
file { $service_key :
|
||||||
|
owner => 'neutron',
|
||||||
|
group => 'neutron',
|
||||||
|
require => Certmonger_certificate['neutron']
|
||||||
|
}
|
||||||
|
|
||||||
|
Certmonger_certificate['neutron'] ~> Service<| tag == 'neutron-service' |>
|
||||||
|
}
|
@@ -93,6 +93,11 @@
|
|||||||
# it will create.
|
# it will create.
|
||||||
# Defaults to hiera('tripleo::profile::base::ovs::certificate_specs', {}).
|
# Defaults to hiera('tripleo::profile::base::ovs::certificate_specs', {}).
|
||||||
#
|
#
|
||||||
|
# [*neutron_certificate_specs*]
|
||||||
|
# (Optional) The specifications to give to certmonger for the certificate(s)
|
||||||
|
# it will create.
|
||||||
|
# Defaults to hiera('tripleo::profile::base::neutron::certificate_specs', {}).
|
||||||
|
#
|
||||||
class tripleo::profile::base::certmonger_user (
|
class tripleo::profile::base::certmonger_user (
|
||||||
$apache_certificates_specs = hiera('apache_certificates_specs', {}),
|
$apache_certificates_specs = hiera('apache_certificates_specs', {}),
|
||||||
$apache_postsave_cmd = undef,
|
$apache_postsave_cmd = undef,
|
||||||
@@ -106,6 +111,7 @@ class tripleo::profile::base::certmonger_user (
|
|||||||
$etcd_certificate_specs = hiera('tripleo::profile::base::etcd::certificate_specs', {}),
|
$etcd_certificate_specs = hiera('tripleo::profile::base::etcd::certificate_specs', {}),
|
||||||
$odl_certificate_specs = hiera('tripleo::profile::base::neutron::opendaylight::certificate_specs', {}),
|
$odl_certificate_specs = hiera('tripleo::profile::base::neutron::opendaylight::certificate_specs', {}),
|
||||||
$ovs_certificate_specs = hiera('tripleo::profile::base::neutron::plugins::ovs::opendaylight::certificate_specs', {}),
|
$ovs_certificate_specs = hiera('tripleo::profile::base::neutron::plugins::ovs::opendaylight::certificate_specs', {}),
|
||||||
|
$neutron_certificate_specs = hiera('tripleo::profile::base::neutron::certificate_specs', {}),
|
||||||
) {
|
) {
|
||||||
unless empty($haproxy_certificates_specs) {
|
unless empty($haproxy_certificates_specs) {
|
||||||
$reload_haproxy = ['systemctl reload haproxy']
|
$reload_haproxy = ['systemctl reload haproxy']
|
||||||
@@ -158,4 +164,7 @@ class tripleo::profile::base::certmonger_user (
|
|||||||
unless empty($ovs_certificate_specs) {
|
unless empty($ovs_certificate_specs) {
|
||||||
ensure_resource('class', 'tripleo::certmonger::openvswitch', $ovs_certificate_specs)
|
ensure_resource('class', 'tripleo::certmonger::openvswitch', $ovs_certificate_specs)
|
||||||
}
|
}
|
||||||
|
unless empty($neutron_certificate_specs) {
|
||||||
|
ensure_resource('class', 'tripleo::certmonger::neutron', $neutron_certificate_specs)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
5
releasenotes/notes/add-neutron-tls-8d020c63f14408d0.yaml
Normal file
5
releasenotes/notes/add-neutron-tls-8d020c63f14408d0.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Adds neutron key/certificate generation for using with Neutron agents for
|
||||||
|
communication with OVS.
|
Reference in New Issue
Block a user