C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove pypi repo and pip extra flags (#6729)

Browse source
This commit is contained in:
Florent Monbillard 2020-09-21 16:27:51 -04:00 committed by GitHub
parent 8908a70c19
commit 5bd937ece0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inventory/sample/group_vars/all/all.yml
View file

@ -87,7 +87,3 @@ loadbalancer_apiserver_healthcheck_port: 8081
## Deploy container engine ## Deploy container engine
# Set false if you want to deploy container engine manually. # Set false if you want to deploy container engine manually.
# deploy_container_engine: true # 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

10
roles/kubespray-defaults/defaults/main.yaml
View file

@ -515,16 +515,6 @@ etcd_snapshot_count: "10000"
certificates_key_size: 2048 certificates_key_size: 2048
certificates_duration: 36500 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_config_dir: /etc/ssl/etcd
etcd_events_data_dir: "/var/lib/etcd-events" etcd_events_data_dir: "/var/lib/etcd-events"
etcd_cert_dir: "{{ etcd_config_dir }}/ssl" etcd_cert_dir: "{{ etcd_config_dir }}/ssl"