github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Ansible: cert gen: use inventory hostname not ip address

Browse Source
This commit is contained in:
Eric Paris 2015-07-06 21:32:42 -04:00
parent b459b796b6
commit 8b57cc8918
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ansible/roles/kubernetes/files/make-ca-cert.sh
View File

@ -20,9 +20,9 @@ set -o pipefail
# Caller should set in the ev: # Caller should set in the ev:
# MASTER_IP - this may be an ip or things like "_use_gce_external_ip_" # MASTER_IP - this may be an ip or things like "_use_gce_external_ip_"
# MASTER_NAME - DNS name for the master
# DNS_DOMAIN - which will be passed to minions in --cluster_domain # DNS_DOMAIN - which will be passed to minions in --cluster_domain
# SERVICE_CLUSTER_IP_RANGE - where all service IPs are allocated # SERVICE_CLUSTER_IP_RANGE - where all service IPs are allocated
# MASTER_NAME - I'm not sure what it is...
# Also the following will be respected # Also the following will be respected
# CERT_DIR - where to place the finished certs # CERT_DIR - where to place the finished certs

4
contrib/ansible/roles/kubernetes/tasks/gen_certs.yml
View File

@ -15,12 +15,12 @@
# FIXME This only generates a cert for one master... # FIXME This only generates a cert for one master...
- name: Run create cert script on master - name: Run create cert script on master
command: command:
"{{ kube_script_dir }}/make-ca-cert.sh {{ inventory_hostname }}" "{{ kube_script_dir }}/make-ca-cert.sh"
args: args:
creates: "{{ kube_cert_dir }}/server.crt" creates: "{{ kube_cert_dir }}/server.crt"
environment: environment:
MASTER_IP: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}" MASTER_IP: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
MASTER_NAME: "kubernetes" MASTER_NAME: "{{ inventory_hostname }}"
DNS_DOMAIN: "{{ dns_domain }}" DNS_DOMAIN: "{{ dns_domain }}"
SERVICE_CLUSTER_IP_RANGE: "{{ kube_service_addresses }}" SERVICE_CLUSTER_IP_RANGE: "{{ kube_service_addresses }}"
CERT_DIR: "{{ kube_cert_dir }}" CERT_DIR: "{{ kube_cert_dir }}"