openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove obsoleted generate_service_certificates 

Remove traces of generate_service_certificates. It was removed during
Pike release cycle [1].

[1] https://review.opendev.org/c/openstack/puppet-tripleo/+/444891

Change-Id: Ib203b52547433ff73141df66641528c389b50361
This commit is contained in:
Carlos Goncalves 2021-03-16 18:39:10 +01:00
parent d18c6abac7
commit 6e7e0ab48e
21 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/apache/apache-baremetal-puppet.j2.yaml
View File

@ -107,7 +107,6 @@ outputs:
- if:
- internal_tls_enabled
-
generate_service_certificates: true
apache::mod::ssl::ssl_ca: {get_param: InternalTLSCAFile}
apache::mod::ssl::ssl_protocol: ['all', '-SSLv2', '-SSLv3', '-TLSv1']
apache_certificates_specs:

1
deployment/cephadm/ceph-grafana.yaml
View File

@ -164,7 +164,6 @@ outputs:
- if:
- internal_tls_enabled
-
generate_service_certificates: true
ceph_grafana_certificate_specs:
service_certificate: '/etc/pki/tls/certs/ceph_grafana.crt'
service_key: '/etc/pki/tls/private/ceph_grafana.key'

1
deployment/cephadm/ceph-mgr.yaml
View File

@ -149,7 +149,6 @@ outputs:
- if:
- internal_tls_enabled
-
generate_service_certificates: true
ceph_dashboard_certificate_specs:
service_certificate: '/etc/pki/tls/certs/ceph_dashboard.crt'
service_key: '/etc/pki/tls/private/ceph_dashboard.key'

1
deployment/cephadm/ceph-rgw.yaml
View File

@ -169,7 +169,6 @@ outputs:
- if:
- internal_tls_enabled
-
generate_service_certificates: true
ceph_rgw_certificate_specs:
service_certificate: '/etc/pki/tls/certs/ceph_rgw.crt'
service_key: '/etc/pki/tls/private/ceph_rgw.key'

1
deployment/database/mysql-base.yaml
View File

@ -151,7 +151,6 @@ outputs:
- if:
- internal_tls_enabled
-
generate_service_certificates: true
tripleo::profile::base::database::mysql::certificate_specs:
service_certificate: '/etc/pki/tls/certs/mysql.crt'
service_key: '/etc/pki/tls/private/mysql.key'

2
deployment/etcd/etcd-container-puppet.yaml
View File

@ -125,7 +125,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::profile::base::etcd::certificate_specs:
service_certificate: '/etc/pki/tls/certs/etcd.crt'
service_key: '/etc/pki/tls/private/etcd.key'

1
deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
View File

@ -71,7 +71,6 @@ outputs:
value:
service_name: haproxy_internal_tls_certmonger
config_settings:
generate_service_certificates: true
tripleo::haproxy::use_internal_certificates: true
certificates_specs:
map_merge:

1
deployment/haproxy/haproxy-public-tls-certmonger.yaml
View File

@ -59,7 +59,6 @@ outputs:
value:
service_name: haproxy_public_tls_certmonger
config_settings:
generate_service_certificates: true
tripleo::haproxy::service_certificate: {get_param: DeployedSSLCertificatePath}
certificates_specs:
haproxy-external:

2
deployment/memcached/memcached-container-puppet.yaml
View File

@ -250,7 +250,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::memcached::service_certificate: '/etc/pki/tls/certs/memcached.crt'
tripleo::profile::base::memcached::certificate_specs:
service_certificate: '/etc/pki/tls/certs/memcached.crt'

2
deployment/metrics/qdr-container-puppet.yaml
View File

@ -228,7 +228,7 @@ outputs:
qdr::listener_auth_peer: {get_param: MetricsQdrAuthenticateClient}
- if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::profile::base::metrics::qdr::ssl_profiles:
list_concat:
- get_param: MetricsQdrSSLProfiles

1
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -389,7 +389,6 @@ outputs:
if:
- ovn_and_tls
-
generate_service_certificates: true
tripleo::profile::base::neutron::plugins::ml2::ovn::protocol: 'ssl'
tripleo::profile::base::neutron::plugins::ml2::ovn::ovn_nb_private_key: '/etc/pki/tls/private/neutron_ovn.key'
tripleo::profile::base::neutron::plugins::ml2::ovn::ovn_nb_certificate: '/etc/pki/tls/certs/neutron_ovn.crt'

1
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -252,7 +252,6 @@ outputs:
- neutron::agents::dhcp::ovsdb_agent_ssl_key_file: '/etc/pki/tls/private/neutron.key'
neutron::agents::dhcp::ovsdb_agent_ssl_cert_file: '/etc/pki/tls/certs/neutron.crt'
neutron::agents::dhcp::ovsdb_agent_ssl_ca_file: {get_param: InternalTLSCAFile}
generate_service_certificates: true
- {}
- if:
- dhcp_ovs_intergation_bridge_unset

2
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -446,7 +446,6 @@ outputs:
if:
- use_tls_for_live_migration
-
generate_service_certificates: true
tripleo::profile::base::nova::migration::client::libvirt_tls: true
tripleo::profile::base::nova::libvirt::tls_password: {get_param: [LibvirtTLSPassword]}
nova::compute::libvirt::tls_priority: {get_param: LibvirtTLSPriority}
@ -475,7 +474,6 @@ outputs:
-
nova::compute::libvirt::qemu::vnc_tls: true
nova::compute::libvirt::qemu::vnc_tls_verify: true
generate_service_certificates: true
- {}
-
if:

1
deployment/nova/nova-vnc-proxy-container-puppet.yaml
View File

@ -214,7 +214,6 @@ outputs:
nova::console_ssl_minimum_version: {get_param: NovaVNCProxySSLMinimumVersion}
nova::cert: /etc/pki/tls/certs/novnc-proxy.crt
nova::key: /etc/pki/tls/private/novnc-proxy.key
generate_service_certificates: true
- {}
service_config_settings:
rabbitmq: {get_attr: [NovaBase, role_data, service_config_settings], rabbitmq}

1
deployment/octavia/providers/ovn-provider-config.yaml
View File

@ -80,7 +80,6 @@ outputs:
- tripleo::profile::base::octavia::provider::ovn::ovn_nb_ca_cert: {get_param: InternalTLSCAFile}
tripleo::profile::base::octavia::provider::ovn::ovn_nb_certificate: '/etc/pki/tls/certs/ovn_octavia.crt'
tripleo::profile::base::octavia::provider::ovn::ovn_nb_private_key: '/etc/pki/tls/private/ovn_octavia.key'
generate_service_certificates: true
- {}
puppet_tags: octavia_ovn_provider_config
provider_driver_labels:

2
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -183,7 +183,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::profile::base::neutron::agents::ovn::protocol: 'ssl'
- {}
service_config_settings: {}

2
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -186,7 +186,7 @@ outputs:
- 'yes'
- if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::profile::pacemaker::ovn_dbs_bundle::ca_file:
get_param: InternalTLSCAFile
tripleo::profile::base::neutron::agents::ovn::protocol: 'ssl'

1
deployment/ovn/ovn-metadata-container-puppet.yaml
View File

@ -205,7 +205,6 @@ outputs:
tripleo::profile::base::neutron::ovn_metadata::protocol: 'ssl'
tripleo::profile::base::neutron::ovn_metadata::ovn_sb_certificate: '/etc/pki/tls/certs/ovn_metadata.crt'
tripleo::profile::base::neutron::ovn_metadata::ovn_sb_private_key: '/etc/pki/tls/private/ovn_metadata.key'
generate_service_certificates: true
- {}
puppet_config:

2
deployment/rabbitmq/rabbitmq-container-puppet.yaml
View File

@ -203,7 +203,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::profile::base::rabbitmq::certificate_specs:
service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'

2
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
View File

@ -147,7 +147,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
tripleo::profile::base::rabbitmq::certificate_specs:

2
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
View File

@ -147,7 +147,7 @@ outputs:
-
if:
- internal_tls_enabled
- generate_service_certificates: true
-
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
tripleo::profile::base::rabbitmq::certificate_specs: