diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-06-10 11:16:33 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-10 11:16:33 +0200 |
| commit | 96c88ea36accedae4e182def9a57fd87d4c7a4e9 (patch) | |
| tree | d9746995fa832ffb2686c0bcc693db370c4377cb | |
| parent | vm/host: configure lvm to ignore zfs volumes (diff) | |
minor cleanups
| -rw-r--r-- | inventory/group_vars/all/main.yml | 1 | ||||
| -rw-r--r-- | roles/dellos6/layer2/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index 4fc2198b..9f2d773d 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -6,6 +6,7 @@ global_cache_dir: "{{ inventory_dir }}/../.cache" # Directory for static assets global_files_dir: "{{ inventory_dir }}/../files" + ssh_users_root: - equinox ssh_keys_root: "{{ ssh_users_root | default([]) | map('extract', users) | map(attribute='ssh') | flatten | list }}" diff --git a/roles/dellos6/layer2/tasks/main.yml b/roles/dellos6/layer2/tasks/main.yml index b8bfa968..92740a3a 100644 --- a/roles/dellos6/layer2/tasks/main.yml +++ b/roles/dellos6/layer2/tasks/main.yml @@ -5,8 +5,18 @@ replace: block notify: save configuration +# - name: dump vlan config +# delegate_to: localhost +# pause: +# prompt: "\n## vlans\n\n{{ lookup('template', 'vlans.j2') }}\n\n" + - name: configure interfaces dellos6_config: src: interfaces.j2 replace: block notify: save configuration + +# - name: dump interface config +# delegate_to: localhost +# pause: +# prompt: "\n## vlans\n\n{{ lookup('template', 'interfaces.j2') }}\n\n" diff --git a/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml b/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml index cb135adc..31fb31d6 100644 --- a/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml +++ b/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml @@ -28,6 +28,7 @@ - name: join kubernetes secondary master node and store log block: - name: join kubernetes secondary master node + throttle: 1 ## TODO test this! command: "kubeadm join 127.0.0.1:6443 --node-name {{ inventory_hostname }} --apiserver-bind-port 6442{% if kubernetes_overlay_node_ip is defined %} --apiserver-advertise-address {{ kubernetes_overlay_node_ip }}{% endif %}{% if kubernetes_cri_socket %} --cri-socket {{ kubernetes_cri_socket }}{% endif %} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ kube_bootstrap_ca_cert_hash }}' --control-plane --certificate-key {{ kubeadm_upload_certs_key }}" args: creates: /etc/kubernetes/kubelet.conf |