Browse Source

Merge "Cleanup remaining implementation for EC2 API"

changes/78/738578/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
c63bb348aa
3 changed files with 0 additions and 56 deletions
  1. +0
    -52
      manifests/haproxy.pp
  2. +0
    -3
      manifests/profile/base/database/mysql.pp
  3. +0
    -1
      spec/fixtures/hieradata/default.yaml

+ 0
- 52
manifests/haproxy.pp View File

@@ -218,14 +218,6 @@
# (optional) Enable or not Nova novncproxy binding
# Defaults to hiera('nova_vnc_proxy_enabled', false)
#
# [*ec2_api*]
# (optional) Enable or not EC2 API binding
# Defaults to hiera('ec2_api_enabled', false)
#
# [*ec2_api_metadata*]
# (optional) Enable or not EC2 API metadata binding
# Defaults to hiera('ec2_api_enabled', false)
#
# [*aodh*]
# (optional) Enable or not Aodh API binding
# Defaults to hiera('aodh_api_enabled', false)
@@ -461,14 +453,6 @@
# (optional) Specify the network placement is running on.
# Defaults to hiera('placement_network', undef)
#
# [*ec2_api_network*]
# (optional) Specify the network ec2_api is running on.
# Defaults to hiera('ec2_api_network', undef)
#
# [*ec2_api_metadata_network*]
# (optional) Specify the network ec2_api_metadata is running on.
# Defaults to hiera('ec2_api_network', undef)
#
# [*etcd_network*]
# (optional) Specify the network etcd is running on.
# Defaults to hiera('etcd_network', undef)
@@ -604,8 +588,6 @@ class tripleo::haproxy (
$placement = hiera('placement_enabled', false),
$nova_metadata = hiera('nova_metadata_enabled', false),
$nova_novncproxy = hiera('nova_vnc_proxy_enabled', false),
$ec2_api = hiera('ec2_api_enabled', false),
$ec2_api_metadata = hiera('ec2_api_enabled', false),
$aodh = hiera('aodh_api_enabled', false),
$barbican = hiera('barbican_api_enabled', false),
$ceph_grafana = hiera('ceph_grafana_enabled', false),
@@ -665,8 +647,6 @@ class tripleo::haproxy (
$placement_network = hiera('placement_network', undef),
$octavia_network = hiera('octavia_api_network', undef),
$ovn_dbs_network = hiera('ovn_dbs_network', undef),
$ec2_api_network = hiera('ec2_api_network', undef),
$ec2_api_metadata_network = hiera('ec2_api_network', undef),
$etcd_network = hiera('etcd_network', undef),
$sahara_network = hiera('sahara_api_network', undef),
$swift_proxy_server_network = hiera('swift_proxy_network', undef),
@@ -721,9 +701,6 @@ class tripleo::haproxy (
ovn_nbdb_ssl_port => 13641,
ovn_sbdb_port => 6642,
ovn_sbdb_ssl_port => 13642,
ec2_api_port => 8788,
ec2_api_ssl_port => 13788,
ec2_api_metadata_port => 8789,
sahara_api_port => 8386,
sahara_api_ssl_port => 13386,
swift_proxy_port => 8080,
@@ -1078,35 +1055,6 @@ class tripleo::haproxy (
}
}

if $ec2_api {
::tripleo::haproxy::endpoint { 'ec2_api':
public_virtual_ip => $public_virtual_ip,
internal_ip => hiera('ec2_api_vip', $controller_virtual_ip),
service_port => $ports[ec2_api_port],
ip_addresses => hiera('ec2_api_node_ips', $controller_hosts_real),
server_names => hiera('ec2_api_node_names', $controller_hosts_names_real),
mode => 'http',
public_ssl_port => $ports[ec2_api_ssl_port],
listen_options => merge($default_listen_options, {
'option' => [ 'tcpka' ]
}),
service_network => $ec2_api_network,
member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}

if $ec2_api_metadata {
::tripleo::haproxy::endpoint { 'ec2_api_metadata':
internal_ip => hiera('ec2_api_vip', $controller_virtual_ip),
service_port => $ports[ec2_api_metadata_port],
ip_addresses => hiera('ec2_api_node_ips', $controller_hosts_real),
server_names => hiera('ec2_api_node_names', $controller_hosts_names_real),
mode => 'http',
service_network => $ec2_api_metadata_network,
member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}

if $aodh {
::tripleo::haproxy::endpoint { 'aodh':
public_virtual_ip => $public_virtual_ip,


+ 0
- 3
manifests/profile/base/database/mysql.pp View File

@@ -288,9 +288,6 @@ class tripleo::profile::base::database::mysql (
if hiera('sahara_api_enabled', false) {
tripleo::profile::base::database::mysql::include_and_check_auth{'sahara::db::mysql':}
}
if hiera('ec2_api_enabled', false) {
tripleo::profile::base::database::mysql::include_and_check_auth{'ec2api::db::mysql':}
}
if hiera('zaqar_api_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
# NOTE: by default zaqar uses sqlalchemy
tripleo::profile::base::database::mysql::include_and_check_auth{'zaqar::db::mysql':}


+ 0
- 1
spec/fixtures/hieradata/default.yaml View File

@@ -84,7 +84,6 @@ manila_api_short_bootstrap_node_name: node
# mistral related items
mistral::keystone::authtoken::password: 'password'
# nova related items
ec2_api_short_bootstrap_node_name: node
nova_api_short_bootstrap_node_name: node
nova_metadata_short_bootstrap_node_name: node
nova_placement_short_bootstrap_node_name: node


Loading…
Cancel
Save