diff options
| -rw-r--r-- | inventory/group_vars/emc-xx/main.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/emc/main.yml | 2 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 3 | ||||
| -rw-r--r-- | spreadspace/emc-xx.yml | 3 |
5 files changed, 10 insertions, 1 deletions
diff --git a/inventory/group_vars/emc-xx/main.yml b/inventory/group_vars/emc-xx/main.yml new file mode 100644 index 00000000..54f7540b --- /dev/null +++ b/inventory/group_vars/emc-xx/main.yml @@ -0,0 +1,2 @@ +--- +#acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" diff --git a/inventory/group_vars/emc/main.yml b/inventory/group_vars/emc/main.yml index afbf4735..d3b3dc12 100644 --- a/inventory/group_vars/emc/main.yml +++ b/inventory/group_vars/emc/main.yml @@ -1,2 +1,4 @@ --- zsh_banner: elevate + +acmetool_account_email: equinox@spreadspace.org diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 483f4039..e0b1b53e 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -65,6 +65,7 @@ emc-dist0 #emc-0[0:6] emc-00 emc-01 +emc-02 ############################### diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index 5d26d161..0230fd11 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -74,7 +74,7 @@ group: app password: "!" -- name: add kubectl config for shells +- name: add kubectl/kubeadm completion for shells with_items: - zsh - bash @@ -84,3 +84,4 @@ marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl ###" content: | source <(kubectl completion {{ item }}) + source <(kubeadm completion {{ item }}) diff --git a/spreadspace/emc-xx.yml b/spreadspace/emc-xx.yml index 4a6b52d2..a8e95cbe 100644 --- a/spreadspace/emc-xx.yml +++ b/spreadspace/emc-xx.yml @@ -7,3 +7,6 @@ - role: sshd - role: zsh - role: admin-user + - role: acmetool/base + - role: acmetool/cert + acmetool_cert_name: "{{ host_name }}.{{ host_domain }}" |