Remove k8s from haproxy
k8s service has been deprecated and is being removed from THT; we don't need that code anymore. Change-Id: I31765715d86546955ca39540d15b247bafdb403f
This commit is contained in:
parent
1015d5ab01
commit
b82deada63
|
@ -282,10 +282,6 @@
|
|||
# (optional) Enable or not Ironic Inspector API binding
|
||||
# Defaults to hiera('ironic_inspector_enabled', false)
|
||||
#
|
||||
# [*kubernetes_master*]
|
||||
# (optional) Enable or not Kubernetes API binding
|
||||
# Defaults to hiera('kubernetes_master_enabled', false)
|
||||
#
|
||||
# [*octavia*]
|
||||
# (optional) Enable or not Octavia APII binding
|
||||
# Defaults to hiera('octavia_api_enabled', false)
|
||||
|
@ -436,10 +432,6 @@
|
|||
# (optional) Specify the network ironic_inspector is running on.
|
||||
# Defaults to hiera('ironic_inspector_network', undef)
|
||||
#
|
||||
# [*kubernetes_master_network*]
|
||||
# (optional) Specify the network kubernetes_master is running on.
|
||||
# Defaults to hiera('kubernetes_master_network', undef)
|
||||
#
|
||||
# [*ironic_network*]
|
||||
# (optional) Specify the network ironic is running on.
|
||||
# Defaults to hiera('ironic_api_network', undef)
|
||||
|
@ -562,8 +554,6 @@
|
|||
# 'ironic_api_ssl_port' (Defaults to 13385)
|
||||
# 'ironic_inspector_port' (Defaults to 5050)
|
||||
# 'ironic_inspector_ssl_port' (Defaults to 13050)
|
||||
# 'kubernetes_master_port' (Defaults to 6443)
|
||||
# 'kubernetes_master_ssl_port' (Defaults to 13443)
|
||||
# 'keystone_admin_api_port' (Defaults to 35357)
|
||||
# 'keystone_public_api_port' (Defaults to 5000)
|
||||
# 'keystone_public_api_ssl_port' (Defaults to 13000)
|
||||
|
@ -673,7 +663,6 @@ class tripleo::haproxy (
|
|||
$designate = hiera('designate_api_enabled', false),
|
||||
$metrics_qdr = hiera('metrics_qdr_enabled', false),
|
||||
$mysql = hiera('mysql_enabled', false),
|
||||
$kubernetes_master = hiera('kubernetes_master_enabled', false),
|
||||
$mysql_clustercheck = false,
|
||||
$mysql_max_conn = undef,
|
||||
$mysql_member_options = undef,
|
||||
|
@ -708,7 +697,6 @@ class tripleo::haproxy (
|
|||
$horizon_network = hiera('horizon_network', undef),
|
||||
$ironic_inspector_network = hiera('ironic_inspector_network', undef),
|
||||
$ironic_network = hiera('ironic_api_network', undef),
|
||||
$kubernetes_master_network = hiera('kubernetes_master_network', undef),
|
||||
$keystone_admin_network = hiera('keystone_admin_api_network', undef),
|
||||
$keystone_public_network = hiera('keystone_public_api_network', undef),
|
||||
$keystone_sticky_sessions = hiera('keystone_sticky_sessions', false),
|
||||
|
@ -760,8 +748,6 @@ class tripleo::haproxy (
|
|||
ironic_api_ssl_port => 13385,
|
||||
ironic_inspector_port => 5050,
|
||||
ironic_inspector_ssl_port => 13050,
|
||||
kubernetes_master_port => 6443,
|
||||
kubernetes_master_ssl_port => 13443,
|
||||
keystone_admin_api_port => 35357,
|
||||
keystone_public_api_port => 5000,
|
||||
keystone_public_api_ssl_port => 13000,
|
||||
|
@ -1698,21 +1684,6 @@ class tripleo::haproxy (
|
|||
}
|
||||
}
|
||||
|
||||
if $kubernetes_master {
|
||||
::tripleo::haproxy::endpoint { 'kubernetes-master':
|
||||
# Note we don't expose the kubernetes endpoint via public_virtual_ip
|
||||
internal_ip => hiera('kubernetes_master_vip', $controller_virtual_ip),
|
||||
service_port => $ports[kubernetes_master_port],
|
||||
ip_addresses => hiera('kubernetes_master_node_ips', $controller_hosts_real),
|
||||
server_names => hiera('kubernetes_master_node_names', $controller_hosts_names_real),
|
||||
public_ssl_port => $ports[kubernetes_master_ssl_port],
|
||||
service_network => $kubernetes_master_network,
|
||||
listen_options => {
|
||||
'balance' => 'roundrobin',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $openshift_master {
|
||||
::tripleo::haproxy::endpoint { 'openshift-master':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
|
|
Loading…
Reference in New Issue