Skip to content

Commit 5ec3a2b

Browse files
wbclarkwbclark
committed
Use fully qualified collection names in playbooks/
1 parent 41ea76d commit 5ec3a2b

5 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎playbooks/collect_debug.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
- role: sos_report
1212
tasks:
1313
- name: "Find bats files"
14-
find:
14+
ansible.builtin.find:
1515
paths: "{{ bats_output_dir }}"
1616
patterns: "*.tap"
1717
register: bats_results
1818

1919
- name: "Copy bats results"
20-
fetch:
20+
ansible.builtin.fetch:
2121
src: "{{ item.path }}"
2222
dest: "{{ remote_dir }}"
2323
with_items: "{{ bats_results.files }}"
2424

2525
- name: "Find smoker files"
26-
find:
26+
ansible.builtin.find:
2727
paths: "{{ smoker_output_dir }}"
2828
patterns:
2929
- "junit.xml"
@@ -34,20 +34,20 @@
3434
register: smoker_results
3535

3636
- name: "Copy smoker results"
37-
fetch:
37+
ansible.builtin.fetch:
3838
src: "{{ item.path }}"
3939
dest: "{{ remote_dir }}"
4040
with_items: "{{ smoker_results.files }}"
4141

4242
- name: "Find backup files"
43-
find:
43+
ansible.builtin.find:
4444
paths: "{{ backup_output_dir }}"
4545
recurse: True
4646
hidden: True
4747
register: backup_results
4848

4949
- name: "Copy backup results"
50-
fetch:
50+
ansible.builtin.fetch:
5151
src: "{{ item.path }}"
5252
dest: "{{ remote_dir }}"
5353
with_items: "{{ backup_results.files }}"

‎playbooks/kubevirt.yml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
- epel_repositories
1515
tasks:
1616
- name: disable swap
17-
command: swapoff -a
17+
ansible.builtin.command: swapoff -a
1818

1919
- name: deconfigure swap
20-
mount:
20+
ansible.posix.mount:
2121
src: /swapfile
2222
fstype: swap
2323
path: none
2424
state: absent
2525

2626
- name: modprobe br_netfilter
27-
modprobe:
27+
community.general.modprobe:
2828
name: br_netfilter
2929

3030
- name: configure bridge iptables
31-
sysctl:
31+
ansible.posix.sysctl:
3232
name: "{{ item }}"
3333
value: 1
3434
sysctl_file: /etc/sysctl.d/k8s.conf
@@ -37,29 +37,29 @@
3737
- net.bridge.bridge-nf-call-iptables
3838

3939
- name: install needed network manager libs
40-
yum:
40+
ansible.builtin.yum:
4141
name:
4242
- NetworkManager-glib
4343
- NetworkManager
4444

4545
- name: Configure bridge
46-
nmcli:
46+
community.general.nmcli:
4747
state: present
4848
type: bridge
4949
conn_name: foreman
5050

5151
- name: install docker
52-
yum:
52+
ansible.builtin.yum:
5353
name: docker
5454

5555
- name: enable docker
56-
service:
56+
ansible.builtin.service:
5757
name: docker
5858
enabled: true
5959
state: started
6060

6161
- name: k8s repo
62-
yum_repository:
62+
ansible.builtin.yum_repository:
6363
name: kubernetes
6464
description: Kubernetes
6565
baseurl: https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
@@ -70,101 +70,101 @@
7070
exclude: kube*
7171

7272
- name: install kubelet kubeadm kubectl
73-
yum:
73+
ansible.builtin.yum:
7474
name:
7575
- kubelet-{{ kubernetes_version }}
7676
- kubeadm-{{ kubernetes_version }}
7777
- kubectl-{{ kubernetes_version }}
7878
disable_excludes: kubernetes
7979

8080
- name: create /etc/systemd/system/kubelet.service.d/
81-
file:
81+
ansible.builtin.file:
8282
path: /etc/systemd/system/kubelet.service.d/
8383
state: directory
8484

8585
- name: enable kubelet accounting
86-
copy:
86+
ansible.builtin.copy:
8787
dest: /etc/systemd/system/kubelet.service.d/11-cgroups.conf
8888
content: |
8989
[Service]
9090
CPUAccounting=true
9191
MemoryAccounting=true
9292
9393
- name: reload systemd
94-
systemd:
94+
ansible.builtin.systemd:
9595
daemon_reload: yes
9696

9797
- name: enable kubelet
98-
service:
98+
ansible.builtin.service:
9999
name: kubelet
100100
enabled: true
101101
state: started
102102

103103
- name: init cluster
104-
command: kubeadm init --pod-network-cidr={{ pod_network }} --apiserver-advertise-address={{ ansible_eth0['ipv4']['address'] }}
104+
ansible.builtin.command: kubeadm init --pod-network-cidr={{ pod_network }} --apiserver-advertise-address={{ ansible_eth0['ipv4']['address'] }}
105105
args:
106106
creates: /etc/kubernetes/admin.conf
107107

108108
- name: untaint master
109-
command: kubectl taint nodes --all node-role.kubernetes.io/master-
109+
ansible.builtin.command: kubectl taint nodes --all node-role.kubernetes.io/master-
110110
register: untaint_master
111111
failed_when: false
112112
changed_when: untaint_master.rc == 0
113113
environment:
114114
KUBECONFIG: /etc/kubernetes/admin.conf
115115

116116
- name: deploy flannel
117-
command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/{{ flannel_version }}/Documentation/kube-flannel.yml
117+
ansible.builtin.command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/{{ flannel_version }}/Documentation/kube-flannel.yml
118118
args:
119119
creates: /etc/cni/net.d/10-flannel.conflist
120120
environment:
121121
KUBECONFIG: /etc/kubernetes/admin.conf
122122

123123
- name: deploy network namespace
124-
command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/namespace.yaml
124+
ansible.builtin.command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/namespace.yaml
125125
args:
126126
creates: /etc/cni/net.d/multus.d/multus.kubeconfig
127127
environment:
128128
KUBECONFIG: /etc/kubernetes/admin.conf
129129

130130
- name: deploy network crd
131-
command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/network-addons-config.crd.yaml
131+
ansible.builtin.command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/network-addons-config.crd.yaml
132132
args:
133133
creates: /etc/cni/net.d/multus.d/multus.kubeconfig
134134
environment:
135135
KUBECONFIG: /etc/kubernetes/admin.conf
136136

137137
- name: deploy network operator
138-
command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/operator.yaml
138+
ansible.builtin.command: kubectl apply -f https://github.com/kubevirt/cluster-network-addons-operator/releases/download/{{ network_operator }}/operator.yaml
139139
args:
140140
creates: /etc/cni/net.d/multus.d/multus.kubeconfig
141141
environment:
142142
KUBECONFIG: /etc/kubernetes/admin.conf
143143

144144
- name: deploy kubevirt operator
145-
command: kubectl apply -f https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_version }}/kubevirt-operator.yaml
145+
ansible.builtin.command: kubectl apply -f https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_version }}/kubevirt-operator.yaml
146146
args:
147147
creates: /var/lib/kubelet/device-plugins/kubevirt-tun.sock
148148
environment:
149149
KUBECONFIG: /etc/kubernetes/admin.conf
150150

151151
- name: deploy kubevirt cr
152-
command: kubectl apply -f https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_version }}/kubevirt-cr.yaml
152+
ansible.builtin.command: kubectl apply -f https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_version }}/kubevirt-cr.yaml
153153
args:
154154
creates: /var/lib/kubelet/device-plugins/kubevirt-tun.sock
155155
environment:
156156
KUBECONFIG: /etc/kubernetes/admin.conf
157157

158158
- name: check for NetworkAddonsConfig
159-
command: kubectl get networkaddonsconfigs cluster
159+
ansible.builtin.command: kubectl get networkaddonsconfigs cluster
160160
environment:
161161
KUBECONFIG: /etc/kubernetes/admin.conf
162162
failed_when: false
163163
changed_when: false
164164
register: netaddonsconfig
165165

166166
- name: prepare NetworkAddonsConfig file
167-
copy:
167+
ansible.builtin.copy:
168168
dest: /tmp/netaddonsconfig
169169
content: |
170170
apiVersion: networkaddonsoperator.network.kubevirt.io/v1alpha1
@@ -179,32 +179,32 @@
179179
when: netaddonsconfig.rc != 0
180180

181181
- name: create NetworkAddonsConfig
182-
command: kubectl create -f /tmp/netaddonsconfig
182+
ansible.builtin.command: kubectl create -f /tmp/netaddonsconfig
183183
environment:
184184
KUBECONFIG: /etc/kubernetes/admin.conf
185185
when: netaddonsconfig.rc != 0
186186

187187
- name: install virtctl
188-
get_url:
188+
ansible.builtin.get_url:
189189
url: https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_version }}/virtctl-{{ kubevirt_version }}-linux-amd64
190190
dest: /usr/bin/virtctl
191191
mode: u=rwx,g=rx,o=rx
192192

193193
- name: wait for the network to be ready
194-
command: kubectl wait networkaddonsconfig cluster --for condition=Ready --timeout=300s
194+
ansible.builtin.command: kubectl wait networkaddonsconfig cluster --for condition=Ready --timeout=300s
195195
environment:
196196
KUBECONFIG: /etc/kubernetes/admin.conf
197197

198198
- name: check for bridge-foreman NetworkAttachmentDefinition
199-
command: kubectl get net-attach-def bridge-foreman
199+
ansible.builtin.command: kubectl get net-attach-def bridge-foreman
200200
environment:
201201
KUBECONFIG: /etc/kubernetes/admin.conf
202202
failed_when: false
203203
changed_when: false
204204
register: bridge_foreman_net_attach
205205

206206
- name: prepare bridge-foreman NetworkAttachmentDefinition file
207-
copy:
207+
ansible.builtin.copy:
208208
dest: /tmp/bridge-foreman-net-attach-def
209209
content: |
210210
apiVersion: "k8s.cni.cncf.io/v1"
@@ -221,21 +221,21 @@
221221
when: bridge_foreman_net_attach.rc != 0
222222

223223
- name: create bridge-foreman NetworkAttachmentDefinition
224-
command: kubectl create -f /tmp/bridge-foreman-net-attach-def
224+
ansible.builtin.command: kubectl create -f /tmp/bridge-foreman-net-attach-def
225225
environment:
226226
KUBECONFIG: /etc/kubernetes/admin.conf
227227
when: bridge_foreman_net_attach.rc != 0
228228

229229
- name: check for foreman-account ServiceAccount
230-
command: kubectl get sa foreman-account
230+
ansible.builtin.command: kubectl get sa foreman-account
231231
environment:
232232
KUBECONFIG: /etc/kubernetes/admin.conf
233233
failed_when: false
234234
changed_when: false
235235
register: foreman_service_sa
236236

237237
- name: prepare foreman-account ServiceAccount file
238-
copy:
238+
ansible.builtin.copy:
239239
dest: /tmp/foreman-account-sa
240240
content: |
241241
apiVersion: v1
@@ -259,33 +259,33 @@
259259
when: foreman_service_sa.rc != 0
260260

261261
- name: create foreman-account ServiceAccount
262-
command: kubectl create -f /tmp/foreman-account-sa
262+
ansible.builtin.command: kubectl create -f /tmp/foreman-account-sa
263263
environment:
264264
KUBECONFIG: /etc/kubernetes/admin.conf
265265
when: foreman_service_sa.rc != 0
266266

267267
- name: create /home/vagrant/.kube
268-
file:
268+
ansible.builtin.file:
269269
path: /home/vagrant/.kube
270270
state: directory
271271
owner: vagrant
272272
group: vagrant
273273

274274
- name: deploy kube config
275-
copy:
275+
ansible.builtin.copy:
276276
src: /etc/kubernetes/admin.conf
277277
dest: /home/vagrant/.kube/config
278278
remote_src: yes
279279
owner: vagrant
280280
group: vagrant
281281

282282
- name: get foreman-account secret
283-
shell: "set -o pipefail && kubectl get secrets $(kubectl get sa foreman-account -o jsonpath='{.secrets[0].name}') -o jsonpath='{.data.token}' | base64 -d | xargs"
283+
ansible.builtin.shell: "set -o pipefail && kubectl get secrets $(kubectl get sa foreman-account -o jsonpath='{.secrets[0].name}') -o jsonpath='{.data.token}' | base64 -d | xargs"
284284
environment:
285285
KUBECONFIG: /etc/kubernetes/admin.conf
286286
changed_when: false
287287
register: foreman_account_secret
288288

289289
- name: show foreman-account secret
290-
debug:
290+
ansible.builtin.debug:
291291
msg: "{{ foreman_account_secret.stdout }}"

‎playbooks/resize_disk.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@
33
become: true
44
tasks:
55
- name: Find root partition
6-
shell: set -o pipefail && df --output=source,fstype / | tail -n 1
6+
ansible.builtin.shell: set -o pipefail && df --output=source,fstype / | tail -n 1
77
register: root_partition
88

99
- name: Install cloud-utils-growpart package
10-
package:
10+
ansible.builtin.package:
1111
name: cloud-utils-growpart
1212
when: ansible_os_family == 'RedHat'
1313

1414
- name: Install cloud-guest-utils package
15-
package:
15+
ansible.builtin.package:
1616
name: cloud-guest-utils
1717
when: ansible_os_family == 'Debian'
1818

1919
- name: Install e2fsprogs package
20-
package:
20+
ansible.builtin.package:
2121
name: e2fsprogs
2222
when: '"ext4" in root_partition.stdout'
2323

2424
- name: Extend partition
25-
command: growpart /dev/vda {{ root_partition.stdout.split(' ')[0].replace('/dev/vda', '') }}
25+
ansible.builtin.command: growpart /dev/vda {{ root_partition.stdout.split(' ')[0].replace('/dev/vda', '') }}
2626
register: growpart_output
2727
failed_when:
2828
- growpart_output.rc != 0
2929
- '"NOCHANGE" not in growpart_output.stdout'
3030

3131
- name: Grow XFS filesystem
32-
command: xfs_growfs -d /
32+
ansible.builtin.command: xfs_growfs -d /
3333
when: '"xfs" in root_partition.stdout'
3434

3535
- name: Grow ext4 filesystem
36-
command: resize2fs {{ root_partition.stdout.split(' ')[0] }}
36+
ansible.builtin.command: resize2fs {{ root_partition.stdout.split(' ')[0] }}
3737
when: '"ext4" in root_partition.stdout'
3838

3939
- name: Grow btrfs filesystem
40-
command: btrfs filesystem resize max /
40+
ansible.builtin.command: btrfs filesystem resize max /
4141
when: '"btrfs" in root_partition.stdout'

0 commit comments

Comments
 (0)