merge with current master, update typos in doc
This commit is contained in:
commit
4e76bced53
8 changed files with 22 additions and 49 deletions
|
@ -25,6 +25,7 @@ To deploy the cluster you can use :
|
|||
* [Ansible variables](docs/ansible.md)
|
||||
* [Cloud providers](docs/cloud.md)
|
||||
* [OpenStack](docs/openstack.md)
|
||||
* [AWS](docs/aws.md)
|
||||
* [Network plugins](#network-plugins)
|
||||
* [Roadmap](docs/roadmap.md)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
OpenStack
|
||||
AWS
|
||||
===============
|
||||
|
||||
To deploy kubespray on [AWS](https://www.openstack.org/) uncomment the `cloud_provider` option in `group_vars/all.yml` and set it to `'aws'`.
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
# Existing search/nameserver resolvconf entries will be purged and
|
||||
# ensured by this additional data:
|
||||
|
||||
# Max of 4 names is allowed and no more than 256 - 17 chars total
|
||||
# (a 2 is reserved for the 'default.svc.' and'svc.')
|
||||
#searchdomains:
|
||||
# - foo.bar.lc
|
||||
|
||||
# Max of 2 is allowed here (a 1 is reserved for the dns_server)
|
||||
#nameservers:
|
||||
# - 127.0.0.1
|
|
@ -1,10 +0,0 @@
|
|||
- name: Dnsmasq | restart network
|
||||
service:
|
||||
name: >-
|
||||
{% if ansible_os_family == "RedHat" -%}
|
||||
network
|
||||
{%- elif ansible_os_family == "Debian" -%}
|
||||
networking
|
||||
{%- endif %}
|
||||
state: restarted
|
||||
when: ansible_os_family != "CoreOS"
|
|
@ -68,17 +68,9 @@
|
|||
resolvconffile: >-
|
||||
{%- if resolvconf.rc == 0 -%}/etc/resolvconf/resolv.conf.d/head{%- else -%}/etc/resolv.conf{%- endif -%}
|
||||
|
||||
- name: generate search domains to resolvconf
|
||||
set_fact:
|
||||
searchentries="{{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }}"
|
||||
|
||||
- name: generate nameservers to resolvconf
|
||||
set_fact:
|
||||
nameserverentries="{{ nameservers|default([]) + [ dns_server ] }}"
|
||||
|
||||
- name: Add search resolv.conf
|
||||
lineinfile:
|
||||
line: "search {{searchentries}}"
|
||||
line: "search {{ [ 'default.svc.' + dns_domain, 'svc.' + dns_domain, dns_domain ] | join(' ') }}"
|
||||
dest: "{{resolvconffile}}"
|
||||
state: present
|
||||
insertbefore: BOF
|
||||
|
@ -87,13 +79,12 @@
|
|||
|
||||
- name: Add local dnsmasq to resolv.conf
|
||||
lineinfile:
|
||||
line: "nameserver {{item}}"
|
||||
line: "nameserver {{dns_server}}"
|
||||
dest: "{{resolvconffile}}"
|
||||
state: present
|
||||
insertafter: "^search.*$"
|
||||
backup: yes
|
||||
follow: yes
|
||||
with_items: "{{nameserverentries}}"
|
||||
|
||||
- name: Add options to resolv.conf
|
||||
lineinfile:
|
||||
|
@ -109,13 +100,11 @@
|
|||
- attempts:2
|
||||
|
||||
- name: disable resolv.conf modification by dhclient
|
||||
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/znodnsupdate mode=0755 backup=yes
|
||||
notify: Dnsmasq | restart network
|
||||
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate mode=0755 backup=yes
|
||||
when: ansible_os_family == "Debian"
|
||||
|
||||
- name: disable resolv.conf modification by dhclient
|
||||
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/znodnsupdate mode=u+x backup=yes
|
||||
notify: Dnsmasq | restart network
|
||||
copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/nodnsupdate mode=u+x backup=yes
|
||||
when: ansible_os_family == "RedHat"
|
||||
|
||||
- name: update resolvconf
|
||||
|
|
|
@ -17,7 +17,7 @@ spec:
|
|||
- --root-ca-file={{ kube_cert_dir }}/ca.pem
|
||||
- --enable-hostpath-provisioner={{ kube_hostpath_dynamic_provisioner }}
|
||||
- --v={{ kube_log_level | default('2') }}
|
||||
{% if cloud_provider is defined and cloud_provider == "openstack"%}
|
||||
{% if cloud_provider is defined and cloud_provider == "openstack" %}
|
||||
- --cloud-provider={{cloud_provider}}
|
||||
- --cloud-config={{ kube_config_dir }}/cloud_config
|
||||
{% elif cloud_provider is defined and cloud_provider == "aws" %}
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
---
|
||||
- name: 'GIT | Install script for collecting git info'
|
||||
template:
|
||||
src: "{{ role_path }}/gen-gitinfos.sh"
|
||||
dest: "{{ bin_dir }}/gen-gitinfos.sh"
|
||||
mode: a+rwx
|
||||
|
||||
- include: gitinfos.yml
|
||||
when: run_gitinfos
|
||||
|
||||
|
|
|
@ -7,11 +7,9 @@
|
|||
debug: false
|
||||
commands:
|
||||
- name: git_info
|
||||
cmd: cat {kargo,.}/.git/logs/HEAD
|
||||
cmd: find . -type d -name .git -execdir sh -c 'gen-gitinfos.sh global|head -12' \;
|
||||
- name: timedate_info
|
||||
cmd: timedatectl status
|
||||
- name: boots_info
|
||||
cmd: journalctl --list-boots --utc --no-pager
|
||||
- name: space_info
|
||||
cmd: df -h
|
||||
- name: kernel_info
|
||||
|
@ -28,10 +26,10 @@
|
|||
cmd: ps auxf | grep -v ]$
|
||||
- name: systemctl_info
|
||||
cmd: systemctl status
|
||||
- name: systemctl_failed_info
|
||||
cmd: systemctl --state=failed --no-pager
|
||||
- name: k8s_info
|
||||
cmd: kubectl get all --all-namespaces -o wide
|
||||
- name: k8s_dump_info
|
||||
cmd: kubectl get all --all-namespaces -o yaml
|
||||
- name: errors_info
|
||||
cmd: journalctl -p err --utc --no-pager
|
||||
|
||||
|
@ -43,10 +41,6 @@
|
|||
- /var/log/kern.log
|
||||
- inventory/inventory.ini
|
||||
- cluster.yml
|
||||
- kargo/kargo_default_ubuntu.yaml
|
||||
- kargo/kargo_default_debian.yaml
|
||||
- kargo/kargo_default_common.yaml
|
||||
- kargo/inventory/inventory.cfg
|
||||
|
||||
tasks:
|
||||
- name: Storing commands output
|
||||
|
@ -68,4 +62,9 @@
|
|||
with_items: "{{logs}}"
|
||||
|
||||
- name: Pack results and logs
|
||||
local_action: shell GZIP=-9 tar cvzf logs.tar.gz -C /tmp collect-info
|
||||
local_action: shell GZIP=-9 tar --remove-files -cvzf logs.tar.gz -C /tmp collect-info
|
||||
run_once: true
|
||||
|
||||
- name: Clean up collected command outputs
|
||||
file: path={{ item.name }} state=absent
|
||||
with_items: "{{commands}}"
|
||||
|
|
Loading…
Reference in a new issue