Skip to content

Commit f400d50

Browse files
mpagotmpagot
committed
Fix ansible lint in qe_sap_storage role
1 parent 21534ab commit f400d50

12 files changed

Lines changed: 73 additions & 84 deletions

File tree

‎ansible/playbooks/sap-hana-storage.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
- name: HANA storage preparation
3030
vars:
31-
sap_storage_cloud_type: 'generic'
32-
sap_storage_sap_type: 'sap_hana'
33-
sap_storage_action: 'prepare'
31+
qe_sap_storage_cloud_type: 'generic'
32+
qe_sap_storage_action: 'prepare'
3433
ansible.builtin.include_role:
3534
name: ../roles/qe_sap_storage

‎ansible/playbooks/tasks/iscsi-server-sbd-prep.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@
5757

5858
- name: Prepare iscsi disks
5959
vars:
60-
sap_storage_cloud_type: 'generic'
61-
sap_storage_sap_type: 'sap_hana'
62-
sap_storage_action: 'prepare'
63-
include_role:
60+
qe_sap_storage_cloud_type: 'generic'
61+
qe_sap_storage_action: 'prepare'
62+
ansible.builtin.include_role:
6463
name: ../roles/qe_sap_storage
6564

6665
- name: Configure HANA SBD target

‎ansible/roles/qe_sap_storage/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ This can be used in 2 ways
2626

2727
| **Variable** | **Info** | **Default** | **Required** |
2828
| :--------------------- | :----------------------- | :---------- | :----------- |
29-
| sap_storage_cloud_type | 'generic' / 'az' / 'aws' | 'generic' | yes |
30-
| sap_storage_action | 'prepare' / 'remove' | 'prepare' | yes |
29+
| qe_sap_storage_cloud_type | 'generic' / 'az' / 'aws' | 'generic' | yes |
30+
| qe_sap_storage_action | 'prepare' / 'remove' | 'prepare' | yes |
3131

3232
### Input
3333

‎ansible/roles/qe_sap_storage/defaults/main.yml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,19 @@
22

33
# Important variables
44

5-
sap_storage_cloud_type: 'generic'
5+
qe_sap_storage_cloud_type: 'generic'
66
# generic | az | aws
77

8-
sap_storage_sap_type: 'sap_onehost'
9-
# sap_onehost | sap_hana | sap_nw
10-
11-
sap_storage_action: 'prepare'
8+
qe_sap_storage_action: 'prepare'
129
# prepare | remove
1310

1411

1512
# Azure variables
1613

17-
sap_storage_az_imds_json:
18-
sap_storage_az_imds_url: 'http://169.254.169.254/metadata/instance/compute?api-version=2020-09-01'
19-
sap_storage_az_vmsize_url: 'http://169.254.169.254/metadata/instance/compute/vmSize?api-version=2017-08-01&format=text'
20-
21-
sap_storage_az_vmsize:
22-
23-
sap_storage_az_lun: '/dev/disk/azure/scsi1/lun'
24-
25-
# AWS variables
26-
27-
sap_storage_aws_imds_url:
28-
sap_storage_aws_vmsize_url:
14+
qe_sap_storage_az_imds_json:
15+
qe_sap_storage_az_imds_url: 'http://169.254.169.254/metadata/instance/compute?api-version=2020-09-01'
16+
qe_sap_storage_az_vmsize_url: 'http://169.254.169.254/metadata/instance/compute/vmSize?api-version=2017-08-01&format=text'
2917

30-
sap_storage_aws_vmsize:
18+
qe_sap_storage_az_vmsize:
3119

32-
# IBM Cloud variables
20+
qe_sap_storage_az_lun: '/dev/disk/azure/scsi1/lun'

‎ansible/roles/qe_sap_storage/tasks/aws_main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
# AWS
4-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - AWS
5-
shell: |
6-
some AWS shit here
7-
register: aws_imds_reg
4+
- name: SAP Storage Preparation - AWS - {{ qe_sap_storage_cloud_type | upper }}
5+
ansible.builtin.shell: |
6+
some AWS code here
7+
changed_when: false

‎ansible/roles/qe_sap_storage/tasks/az_main.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,36 @@
66

77
# Create json format of IMDS
88
# Todo: Ansibilize this
9-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - Create json format of IMDS
10-
shell: |
11-
curl -H Metadata:true --noproxy "*" "{{ sap_storage_az_imds_url }}" | python3 -mjson.tool
12-
register: az_imds_reg
9+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - Create json format of IMDS
10+
ansible.builtin.shell: |
11+
curl -H Metadata:true --noproxy "*" "{{ qe_sap_storage_az_imds_url }}" | python3 -mjson.tool
12+
register: qe_sap_storage_az_imds_reg
1313
args:
1414
executable: /bin/bash
1515
# If this fails, that means this VM is not Azure?
1616

17-
- set_fact:
18-
sap_storage_az_imds_json: "{{ az_imds_reg.stdout }}"
17+
- name: Store imds json
18+
ansible.builtin.set_fact:
19+
qe_sap_storage_az_imds_json: "{{ qe_sap_storage_az_imds_reg.stdout }}"
1920

2021
# Pull VMSize
2122
# Todo: Ansibilize this
22-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - Pull VMSize
23-
shell: |
24-
curl -H Metadata:true --noproxy "*" "{{ sap_storage_az_vmsize_url }}"
23+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - Pull VMSize
24+
ansible.builtin.shell: |
25+
curl -H Metadata:true --noproxy "*" "{{ qe_sap_storage_az_vmsize_url }}"
2526
register: az_vmsize_reg
2627
args:
2728
executable: /bin/bash
2829

29-
- debug:
30+
- name: VM size output
31+
ansible.builtin.debug:
3032
msg:
3133
- "{{ az_vmsize_reg.stdout }}"
3234

33-
- set_fact:
34-
sap_storage_az_vmsize: "{{ az_vmsize_reg.stdout }}"
35+
- name: "Calculate qe_sap_storage_az_vmsize"
36+
ansible.builtin.set_fact:
37+
qe_sap_storage_az_vmsize: "{{ az_vmsize_reg.stdout }}"
3538

3639
# Include vars depending on VM Size
37-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - Load Variables for {{ sap_storage_az_vmsize }}
38-
include_vars: "{{ sap_storage_cloud_type }}_tasks/vmsizes/{{ sap_storage_az_vmsize }}.yml"
40+
- name: SAP Storage Preparation - Load Variables for {{ qe_sap_storage_az_vmsize }}
41+
ansible.builtin.include_vars: "{{ qe_sap_storage_cloud_type }}_tasks/vmsizes/{{ qe_sap_storage_az_vmsize }}.yml"

‎ansible/roles/qe_sap_storage/tasks/az_tasks/prepare_storage.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22

33
# Striped volume
4-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} - Striped
4+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} - Striped
55
when:
66
- "item.value.numluns != '1'"
77
block:
88
# Get LUNs from metadata
9-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Get LUNs from metadata
9+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Get LUNs from metadata
1010
ansible.builtin.shell: |
1111
for i in {1..{{ item.value.numluns }}}
1212
do
13-
{{ item.value.vg }}${i}lun="{{ sap_storage_az_lun }} \
13+
{{ item.value.vg }}${i}lun="{{ qe_sap_storage_az_lun }} \
1414
`awk '/caching/ { r=""; f=1 } f { r = (r ? r ORS : "") $0 } \
1515
/writeAcceleratorEnabled/ \
1616
{ if (f && r ~ /{{ item.value.name }}${i}/) print r; f=0 }' \
17-
{{ sap_storage_az_imds_json }} \
17+
{{ qe_sap_storage_az_imds_json }} \
1818
| grep lun | sed 's/[^0-9]*//g'`"
1919
echo ${{ item.value.vg }}${i}lun
2020
done
@@ -27,14 +27,14 @@
2727
pvs_list: "{{ pvs_reg.stdout.split() }}"
2828

2929
# Create Volume Group
30-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Volume Group Striped
30+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Volume Group Striped
3131
community.general.lvg:
3232
vg: "{{ item.value.vg }}"
3333
pvs: "{{ pvs_list | join(',') }}"
3434
force: true
3535

3636
# Create Logical Group
37-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Logical Volume - Striped
37+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Logical Volume - Striped
3838
community.general.lvol:
3939
vg: "{{ item.value.vg }}"
4040
lv: "{{ item.value.lv }}"
@@ -43,19 +43,19 @@
4343

4444

4545
# Single volume
46-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} - Single Volume
46+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} - Single Volume
4747
when:
4848
- "item.value.numluns == '1'"
4949
block:
5050

5151
# Get LUNs from metadata
52-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Get LUNs from metadata
52+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Get LUNs from metadata
5353
ansible.builtin.shell: |
54-
{{ item.value.vg }}lun="{{ sap_storage_az_lun }} \
54+
{{ item.value.vg }}lun="{{ qe_sap_storage_az_lun }} \
5555
`awk '/caching/ { r=""; f=1 } f { r = (r ? r ORS : "") $0 } \
5656
/writeAcceleratorEnabled/ \
5757
{ if (f && r ~ /{{ item.value.name }}/) print r; f=0 }' \
58-
{{ sap_storage_az_imds_json }} \
58+
{{ qe_sap_storage_az_imds_json }} \
5959
| grep lun | sed 's/[^0-9]*//g'`"
6060
echo ${{ item.value.vg }}lun
6161
args:
@@ -67,28 +67,28 @@
6767
pvs_one: "{{ pvs_reg.stdout }}"
6868

6969
# Create Volume Group
70-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Volume Group One
70+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Volume Group One
7171
community.general.lvg:
7272
vg: "{{ item.value.vg }}"
7373
pvs: "{{ pvs_one }}"
7474
force: true
7575

7676
# Create Logical Group
77-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Logical Volume - One
77+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Logical Volume - One
7878
community.general.lvol:
7979
vg: "{{ item.value.vg }}"
8080
lv: "{{ item.value.lv }}"
8181
size: 100%VG
8282

8383

8484
# Create Filesystem
85-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Filesystem
85+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Filesystem
8686
community.general.filesystem:
8787
fstype: xfs
8888
dev: "/dev/{{ item.value.vg }}/{{ item.value.lv }}"
8989

9090
# Mount Filesystem
91-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ sap_storage_az_vmsize }} - {{ item.value.name }} Mount
91+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ qe_sap_storage_az_vmsize }} - {{ item.value.name }} Mount
9292
ansible.posix.mount:
9393
path: "{{ item.value.directory }}"
9494
fstype: xfs

‎ansible/roles/qe_sap_storage/tasks/az_tasks/remove_storage.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
---
22

33
# Unmount Filesystem
4-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Unmount Filesystem
4+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Unmount Filesystem
55
ansible.posix.mount:
66
path: "{{ item.value.directory }}"
77
state: absent
88

99
# Remove Filesystem
10-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Filesystem
10+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Filesystem
1111
ansible.builtin.shell: |
1212
/sbin/wipefs --all -f /dev/mapper/{{ item.value.vg }}-{{ item.value.lv }}
1313
1414
# Remove Logical Volume
15-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Logical Volume
15+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Logical Volume
1616
community.general.lvol:
1717
lv: "{{ item.value.lv }}"
1818
vg: "{{ item.value.vg }}"
1919
state: absent
20-
force: yes
20+
force: true
2121

2222
# Remove Volume Group
23-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Volume Group
23+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Remove Volume Group
2424
community.general.lvg:
2525
vg: "{{ item.value.vg }}"
2626
state: absent
27-
force: yes
27+
force: true

‎ansible/roles/qe_sap_storage/tasks/generic_main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
################
66

77
- name: SAP Storage Preparation - Generic Pretasks
8-
debug:
8+
ansible.builtin.debug:
99
msg: "No pre task"

‎ansible/roles/qe_sap_storage/tasks/generic_tasks/prepare_storage.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
msg: "Using PV list: {{ (adjusted_pv is defined and (adjusted_pv | length) > 0) | ternary(adjusted_pv, item.value.pv) }}"
7070

7171
# Create Volume Group
72-
- name: SAP Storage Preparation - Volume Group One - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }}
72+
- name: SAP Storage Preparation - Volume Group One - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }}
7373
community.general.lvg:
7474
vg: "{{ item.value.vg }}"
7575
pvs: "{{ (adjusted_pv is defined and (adjusted_pv | length) > 0) | ternary(adjusted_pv, item.value.pv) }}"
@@ -85,7 +85,7 @@
8585
when: adjusted_pv is defined
8686

8787
# Create Logical Group - One
88-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Logical Volume - One
88+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Logical Volume - One
8989
community.general.lvol:
9090
vg: "{{ item.value.vg }}"
9191
lv: "{{ item.value.lv }}"
@@ -94,7 +94,7 @@
9494
- "item.value.numluns == '1'"
9595

9696
# Create Logical Group - Striped
97-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Logical Volume - Striped
97+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Logical Volume - Striped
9898
community.general.lvol:
9999
vg: "{{ item.value.vg }}"
100100
lv: "{{ item.value.lv }}"
@@ -104,13 +104,13 @@
104104
- "item.value.numluns != '1'"
105105

106106
# Create Filesystem
107-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Filesystem
107+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Filesystem
108108
community.general.filesystem:
109109
fstype: xfs
110110
dev: "/dev/{{ item.value.vg }}/{{ item.value.lv }}"
111111

112112
# Mount Filesystem
113-
- name: SAP Storage Preparation - {{ sap_storage_cloud_type | upper }} - {{ item.value.name }} Mount
113+
- name: SAP Storage Preparation - {{ qe_sap_storage_cloud_type | upper }} - {{ item.value.name }} Mount
114114
ansible.posix.mount:
115115
path: "{{ item.value.directory }}"
116116
fstype: xfs

0 commit comments

Comments
 (0)