mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-14 17:50:06 -03:30
Move set_facts to kubespray-defaults defaults
These facts can be generated in defaults with a performance boost. Also cleaned up duplicate etcd var names.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
ETCD_ENDPOINTS="{{ etcd_access_endpoint }}"
|
||||
ETCD_ENDPOINTS="{{ etcd_access_addresses }}"
|
||||
ETCD_CA_CERT_FILE="{{ calico_cert_dir }}/ca_cert.crt"
|
||||
ETCD_CERT_FILE="{{ calico_cert_dir }}/cert.crt"
|
||||
ETCD_KEY_FILE="{{ calico_cert_dir }}/key.pem"
|
||||
|
||||
@@ -4,7 +4,7 @@ metadata:
|
||||
name: calico-config
|
||||
namespace: {{ system_namespace }}
|
||||
data:
|
||||
etcd_endpoints: "{{ etcd_access_endpoint }}"
|
||||
etcd_endpoints: "{{ etcd_access_addresses }}"
|
||||
etcd_ca: "/calico-secrets/ca_cert.crt"
|
||||
etcd_cert: "/calico-secrets/cert.crt"
|
||||
etcd_key: "/calico-secrets/key.pem"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
{{ docker_bin_dir }}/docker run -i --privileged --rm \
|
||||
--net=host --pid=host \
|
||||
-e ETCD_ENDPOINTS={{ etcd_access_endpoint }} \
|
||||
-e ETCD_ENDPOINTS={{ etcd_access_addresses }} \
|
||||
-e ETCD_CA_CERT_FILE={{ calico_cert_dir }}/ca_cert.crt \
|
||||
-e ETCD_CERT_FILE={{ calico_cert_dir }}/cert.crt \
|
||||
-e ETCD_KEY_FILE={{ calico_cert_dir }}/key.pem \
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
"nodename": "{{ ansible_hostname }}",
|
||||
{% endif %}
|
||||
"type": "calico",
|
||||
"etcd_endpoints": "{{ etcd_access_endpoint }}",
|
||||
"etcd_endpoints": "{{ etcd_access_addresses }}",
|
||||
"etcd_cert_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem",
|
||||
"etcd_key_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem",
|
||||
"etcd_ca_cert_file": "{{ etcd_cert_dir }}/ca.pem",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
{{ docker_bin_dir }}/docker run -i --privileged --rm \
|
||||
--net=host --pid=host \
|
||||
-e ETCD_ENDPOINTS={{ etcd_access_endpoint }} \
|
||||
-e ETCD_ENDPOINTS={{ etcd_access_addresses }} \
|
||||
-e ETCD_CA_CERT_FILE={{ canal_cert_dir }}/ca_cert.crt \
|
||||
-e ETCD_CERT_FILE={{ canal_cert_dir }}/cert.crt \
|
||||
-e ETCD_KEY_FILE={{ canal_cert_dir }}/key.pem \
|
||||
|
||||
@@ -7,7 +7,7 @@ metadata:
|
||||
name: canal-config
|
||||
data:
|
||||
# Configure this with the location of your etcd cluster.
|
||||
etcd_endpoints: "{{ etcd_access_endpoint }}"
|
||||
etcd_endpoints: "{{ etcd_access_addresses }}"
|
||||
|
||||
# The interface used by canal for host <-> host communication.
|
||||
# If left blank, then the interface is chosing using the node's
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"type": "flannel",
|
||||
"delegate": {
|
||||
"type": "calico",
|
||||
"etcd_endpoints": "{{ etcd_access_endpoint }}",
|
||||
"etcd_endpoints": "{{ etcd_access_addresses }}",
|
||||
"log_level": "info",
|
||||
"policy": {
|
||||
"type": "k8s"
|
||||
|
||||
Reference in New Issue
Block a user