diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index 4fe7c461a..f3b7042d3 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -87,7 +87,3 @@ loadbalancer_apiserver_healthcheck_port: 8081 ## Deploy container engine # Set false if you want to deploy container engine manually. # deploy_container_engine: true - -## Set Pypi repo and cert accordingly -# pyrepo_index: https://pypi.example.com/simple -# pyrepo_cert: /etc/ssl/certs/ca-certificates.crt diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index b672fda2d..7ce195147 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -515,16 +515,6 @@ etcd_snapshot_count: "10000" certificates_key_size: 2048 certificates_duration: 36500 -pip_extra_args: |- - {%- set pip_extra_args_list = [] -%} - {%- if pyrepo_index is defined -%} - {%- set DO = pip_extra_args_list.append('--index-url %s' | format(pyrepo_index)) -%} - {%- if pyrepo_cert is defined -%} - {%- set DO = pip_extra_args_list.append('--cert %s' | format(pyrepo_cert)) -%} - {%- endif -%} - {%- endif -%} - {{ pip_extra_args_list|join(' ') }} - etcd_config_dir: /etc/ssl/etcd etcd_events_data_dir: "/var/lib/etcd-events" etcd_cert_dir: "{{ etcd_config_dir }}/ssl"