Cleanup unused/erroneous variables (#6003)

This commit is contained in:
Florian Ruynat
2020-04-24 10:54:07 +02:00
committed by GitHub
parent 6674be2572
commit 299e35ebe4
8 changed files with 6 additions and 51 deletions

View File

@@ -1,7 +1,5 @@
---
## CentOS/RHEL specific variables
# Install epel repo on Centos/RHEL
centos_epel_enabled: false
# Use the fastestmirror yum plugin
centos_fastestmirror_enabled: false

View File

@@ -20,10 +20,10 @@ ca-file="{{ kube_config_dir }}/external-openstack-cacert.pem"
[LoadBalancer]
use-octavia={{ external_openstack_lbaas_use_octavia }}
create-monitor={{ openstack_lbaas_create_monitor }}
monitor-delay={{ openstack_lbaas_monitor_delay }}
monitor-timeout={{ openstack_lbaas_monitor_timeout }}
monitor-max-retries={{ openstack_lbaas_monitor_max_retries }}
create-monitor={{ external_openstack_lbaas_create_monitor }}
monitor-delay={{ external_openstack_lbaas_monitor_delay }}
monitor-timeout={{ external_openstack_lbaas_monitor_timeout }}
monitor-max-retries={{ external_openstack_lbaas_monitor_max_retries }}
{% if external_openstack_lbaas_method is defined %}
lb-method={{ external_openstack_lbaas_method }}
{% endif %}

View File

@@ -5,5 +5,3 @@ alb_ingress_aws_region: "us-east-1"
# Enables logging on all outbound requests sent to the AWS API.
# If logging is desired, set to true.
alb_ingress_aws_debug: "false"
alb_ingress_log_level: "WARN"

View File

@@ -394,16 +394,6 @@ local_volume_provisioner_storage_classes: |
# you can use --extra-vars to pass the password in command line
weave_password: EnterPasswordHere
# Weave uses consensus mode by default
# Enabling seed mode allow to dynamically add or remove hosts
# https://www.weave.works/docs/net/latest/ipam/
weave_mode_seed: false
# This two variable are automatically changed by the weave's role in group_vars/k8s-cluster.yml.
# Do not manually change these values
weave_seed: uninitialized
weave_peers: uninitialized
# Contiv L3 BGP Mode
contiv_peer_with_uplink_leaf: false
contiv_global_as: "65002"

View File

@@ -27,10 +27,6 @@ calico_node_memory_limit: 500M
calico_node_cpu_limit: 300m
calico_node_memory_requests: 64M
calico_node_cpu_requests: 150m
calicoctl_memory_limit: 170M
calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 32M
calicoctl_cpu_requests: 250m
calico_felix_chaininsertmode: Insert
# Enable Prometheus Metrics endpoint for felix

View File

@@ -8,9 +8,6 @@ canal_iface: ""
# the pod network.
canal_masquerade: "true"
# Log-level
canal_log_level: "info"
# Etcd SSL dirs
canal_cert_dir: /etc/canal/certs
@@ -26,10 +23,6 @@ flannel_memory_limit: 500M
flannel_cpu_limit: 200m
flannel_memory_requests: 64M
flannel_cpu_requests: 50m
calicoctl_memory_limit: 170M
calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 32M
calicoctl_cpu_requests: 25m
# etcd cert filenames
kube_etcd_cacert_file: ca.pem