Skip to content

K
k3s
Unverified Commit 742571e6 authored by Erik Wilson's avatar Erik Wilson Committed by GitHub
Browse files
Options

Merge pull request #1429 from St0rmingBr4in/inventory-subdirectory

contrib/ansible: Move example inventory into subdirectory and add extra_server_args
parents 42108006 cddcbe78
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
contrib/ansible/README.md
View file @ 742571e6
...@@ -40,7 +40,7 @@ node ...@@ -40,7 +40,7 @@ node
Start provisioning of the cluster using the following command: Start provisioning of the cluster using the following command:
``` ```
ansible-playbook site.yml ansible-playbook site.yml -i inventory/hosts.ini
``` ```
## Kubeconfig ## Kubeconfig
......
contrib/ansible/group_vars/all.yml → contrib/ansible/inventory/group_vars/all.yml
View file @ 742571e6
...@@ -2,3 +2,4 @@ k3s_version: v0.8.1 ...@@ -2,3 +2,4 @@ k3s_version: v0.8.1
ansible_user: debian ansible_user: debian
systemd_dir: /etc/systemd/system systemd_dir: /etc/systemd/system
master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}" master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}"
extra_server_args: ""
contrib/ansible/roles/k3s/master/templates/k3s.service.j2
View file @ 742571e6
...@@ -5,7 +5,7 @@ After=network-online.target ...@@ -5,7 +5,7 @@ After=network-online.target
[Service] [Service]
ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server ExecStart=/usr/local/bin/k3s server {{ extra_server_args | default("") }}
KillMode=process KillMode=process
Delegate=yes Delegate=yes
LimitNOFILE=infinity LimitNOFILE=infinity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment