--- Class[Liberica].orig
+++ Class[Liberica]
@@
- config => {'hcforwarder': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1100'}, 'prometheus': {'addresses': ['10.80.0.3:3000', '[2a02:ec80:300:101:10:80:0:3]:3000']}, 'hashing_algorithm': 'jenkins', 'interface': {'egress': 'eno12399np0', 'v4': 'ipip0', 'v6': 'ipip60'}}, 'healthcheck': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1101'}, 'prometheus': {'addresses': ['10.80.0.3:3001', '[2a02:ec80:300:101:10:80:0:3]:3001']}}, 'fp': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1102'}, 'prometheus': {'addresses': ['10.80.0.3:3002', '[2a02:ec80:300:101:10:80:0:3]:3002']}, 'forwarding_plane': 'katran', 'katran': {'interface': 'eno12399np0', 'conntrack_size': 8000000}}, 'cp': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1103'}, 'prometheus': {'addresses': ['10.80.0.3:3003', '[2a02:ec80:300:101:10:80:0:3]:3003']}}, 'etcd': {'conftool_domain': 'eqiad.wmnet', 'datacenter': 'esams'}, 'bgp': {'grpc': {'network': 'tcp', 'address': '127.0.0.1:50051'}, 'asn': 64600, 'next_hop_ipv4': '10.80.0.3', 'next_hop_ipv6': '2a02:ec80:300:101:10:80:0:3', 'peers': ['10.80.0.1']}, 'services': {'ncredirlb_80': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '185.15.59.226', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L7-http://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'http://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredirlb6_80': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '2a02:ec80:300:ed1a::3', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L7-http://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'http://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredir-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '185.15.59.226', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'https://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredir-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '2a02:ec80:300:ed1a::3', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'https://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'textlb_80': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.224', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'textlb6_80': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::1', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'text-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.224', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}, 'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'text-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::1', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}, 'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.225', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::2', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-sshlb_29418': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gerrit', 'ip': '185.15.59.225', 'port': 29418, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'gerrit-sshlb6_29418': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gerrit', 'ip': '2a02:ec80:300:ed1a::2', 'port': 29418, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}}}
+ config => {'hcforwarder': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1100'}, 'prometheus': {'addresses': ['10.80.0.3:3000', '[2a02:ec80:300:101:10:80:0:3]:3000']}, 'hashing_algorithm': 'jenkins', 'interface': {'egress': 'eno12399np0', 'v4': 'ipip0', 'v6': 'ipip60'}}, 'healthcheck': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1101'}, 'prometheus': {'addresses': ['10.80.0.3:3001', '[2a02:ec80:300:101:10:80:0:3]:3001']}}, 'fp': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1102'}, 'prometheus': {'addresses': ['10.80.0.3:3002', '[2a02:ec80:300:101:10:80:0:3]:3002']}, 'forwarding_plane': 'katran', 'katran': {'interface': 'eno12399np0', 'conntrack_size': 8000000}}, 'cp': {'log_level': 'info', 'grpc': {'network': 'tcp', 'address': '127.0.0.1:1103'}, 'prometheus': {'addresses': ['10.80.0.3:3003', '[2a02:ec80:300:101:10:80:0:3]:3003']}}, 'etcd': {'conftool_domain': 'eqiad.wmnet', 'datacenter': 'esams'}, 'bgp': {'grpc': {'network': 'tcp', 'address': '127.0.0.1:50051'}, 'asn': 64600, 'next_hop_ipv4': '10.80.0.3', 'next_hop_ipv6': '2a02:ec80:300:101:10:80:0:3', 'peers': ['10.80.0.1']}, 'services': {'ncredirlb_80': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '185.15.59.226', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L7-http://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'http://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredirlb6_80': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '2a02:ec80:300:ed1a::3', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L7-http://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'http://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredir-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '185.15.59.226', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'https://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'ncredir-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'ncredir', 'service': 'nginx', 'ip': '2a02:ec80:300:ed1a::3', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://en.wikipedia.com/_status': {'type': 'HTTPCheck', 'url': 'https://en.wikipedia.com/_status', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'textlb_80': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.224', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'textlb6_80': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::1', 'port': 80, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'text-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.224', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}, 'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'text-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.66, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::1', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}, 'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.225', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::2', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gerrit-sshlb_29418': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gerrit', 'ip': '185.15.59.225', 'port': 29418, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'gerrit-sshlb6_29418': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gerrit', 'ip': '2a02:ec80:300:ed1a::2', 'port': 29418, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'gitlab-httpslb_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '185.15.59.228', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gitlab-httpslb6_443': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'cache_text', 'service': 'cdn', 'ip': '2a02:ec80:300:ed1a::4', 'port': 443, 'protocol': 'tcp', 'healthchecks': {'L7-https://healthcheck.wikimedia.org/varnish-fe': {'type': 'HTTPCheck', 'url': 'https://healthcheck.wikimedia.org/varnish-fe', 'status_code': 200, 'timeout': '5s', 'check_period': '10s'}}}, 'gitlab-sshlb_2222': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gitlab', 'ip': '185.15.59.228', 'port': 2222, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}, 'gitlab-sshlb6_2222': {'forward_type': 'tunnel', 'depool_threshold': 0.5, 'cluster': 'tcp-proxy', 'service': 'gitlab', 'ip': '2a02:ec80:300:ed1a::4', 'port': 2222, 'protocol': 'tcp', 'healthchecks': {'L4': {'type': 'IdleTCPConnectionCheck', 'timeout': '3s', 'check_period': '300ms', 'reconnect_period': '1s'}}}}}
File[/etc/liberica/config.yaml]
- Content differences:
--- /etc/liberica/config.yaml.orig
+++ /etc/liberica/config.yaml
@@ -243,3 +243,61 @@
timeout: 3s
check_period: 300ms
reconnect_period: 1s
+ gitlab-httpslb_443:
+ forward_type: tunnel
+ depool_threshold: 0.5
+ cluster: cache_text
+ service: cdn
+ ip: 185.15.59.228
+ port: 443
+ protocol: tcp
+ healthchecks:
+ L7-https://healthcheck.wikimedia.org/varnish-fe:
+ type: HTTPCheck
+ url: https://healthcheck.wikimedia.org/varnish-fe
+ status_code: 200
+ timeout: 5s
+ check_period: 10s
+ gitlab-httpslb6_443:
+ forward_type: tunnel
+ depool_threshold: 0.5
+ cluster: cache_text
+ service: cdn
+ ip: 2a02:ec80:300:ed1a::4
+ port: 443
+ protocol: tcp
+ healthchecks:
+ L7-https://healthcheck.wikimedia.org/varnish-fe:
+ type: HTTPCheck
+ url: https://healthcheck.wikimedia.org/varnish-fe
+ status_code: 200
+ timeout: 5s
+ check_period: 10s
+ gitlab-sshlb_2222:
+ forward_type: tunnel
+ depool_threshold: 0.5
+ cluster: tcp-proxy
+ service: gitlab
+ ip: 185.15.59.228
+ port: 2222
+ protocol: tcp
+ healthchecks:
+ L4:
+ type: IdleTCPConnectionCheck
+ timeout: 3s
+ check_period: 300ms
+ reconnect_period: 1s
+ gitlab-sshlb6_2222:
+ forward_type: tunnel
+ depool_threshold: 0.5
+ cluster: tcp-proxy
+ service: gitlab
+ ip: 2a02:ec80:300:ed1a::4
+ port: 2222
+ protocol: tcp
+ healthchecks:
+ L4:
+ type: IdleTCPConnectionCheck
+ timeout: 3s
+ check_period: 300ms
+ reconnect_period: 1s
Class[Profile::Liberica]
- Parameters differences:
--- Class[Profile::Liberica].orig
+++ Class[Profile::Liberica]
@@
- include_services => ['ncredir', 'ncredir-https', 'text', 'text-https', 'gerrit-https', 'gerrit-ssh']
+ include_services => ['ncredir', 'ncredir-https', 'text', 'text-https', 'gerrit-https', 'gerrit-ssh', 'gitlab-https', 'gitlab-ssh']