openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "ec2api: Enable ssl in api/metadata"

Browse Source
This commit is contained in:
Zuul 2023-03-18 05:53:37 +00:00 committed by Gerrit Code Review
commit 9381c8f5dd
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/ec2api.pp
View File

@ -5,10 +5,18 @@ class openstack_integration::ec2api {
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'ec2api':
notify => Anchor['ec2api::service::begin'],
require => Anchor['ec2api::install::end'],
}
Exec['update-ca-certificates'] ~> Service<| tag == 'ec2api-service' |>
}
class { 'ec2api::keystone::auth': class { 'ec2api::keystone::auth':
public_url => "http://${::openstack_integration::config::ip_for_url}:8788", public_url => "${::openstack_integration::config::base_url}:8788",
internal_url => "http://${::openstack_integration::config::ip_for_url}:8788", internal_url => "${::openstack_integration::config::base_url}:8788",
admin_url => "http://${::openstack_integration::config::ip_for_url}:8788", admin_url => "${::openstack_integration::config::base_url}:8788",
password => 'a_big_secret', password => 'a_big_secret',
} }
class { 'ec2api::db::mysql': class { 'ec2api::db::mysql':
@ -17,6 +25,7 @@ class openstack_integration::ec2api {
password => 'ec2api', password => 'ec2api',
host => $::openstack_integration::config::host, host => $::openstack_integration::config::host,
} }
case $facts['os']['family'] { case $facts['os']['family'] {
'RedHat': { 'RedHat': {
class { 'ec2api::db': class { 'ec2api::db':
@ -48,10 +57,14 @@ class openstack_integration::ec2api {
ec2api_listen => $::openstack_integration::config::host, ec2api_listen => $::openstack_integration::config::host,
keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens", keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",
external_network => 'public', external_network => 'public',
ec2api_use_ssl => $::openstack_integration::config::ssl,
ssl_cert_file => $::openstack_integration::params::cert_path,
ssl_key_file => "/etc/ec2api/ssl/private/${facts['networking']['fqdn']}.pem",
} }
class { 'ec2api::metadata': class { 'ec2api::metadata':
nova_metadata_ip => $::openstack_integration::config::host, nova_metadata_ip => $::openstack_integration::config::host,
metadata_listen => $::openstack_integration::config::host, metadata_listen => $::openstack_integration::config::host,
metadata_use_ssl => $::openstack_integration::config::ssl,
} }
} }
'Debian': { 'Debian': {

2
manifests/tempest.pp
View File

@ -346,7 +346,7 @@ class openstack_integration::tempest (
l2gw_switch => $l2gw_switch, l2gw_switch => $l2gw_switch,
disable_dashboard_ssl_validation => true, disable_dashboard_ssl_validation => true,
ec2api_tester_roles => ['member'], ec2api_tester_roles => ['member'],
aws_ec2_url => "http://${::openstack_integration::config::ip_for_url}:8788/", aws_ec2_url => "${::openstack_integration::config::base_url}:8788/",
aws_region => 'regionOne', aws_region => 'regionOne',
# TODO(tkajinam): we have to configure image id parameters but we have to # TODO(tkajinam): we have to configure image id parameters but we have to
# obtain id from EC2 api. # obtain id from EC2 api.