Skip to content

Commit 76c604f

Browse files
marcelmamulamarcelmamula
committed
fix incorrectly called os image name instead of value
1 parent a1c7269 commit 76c604f

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

‎roles/sap_vm_provision/tasks/validations/aws_ec2_vs.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
vars:
7575
__sap_vm_provision_os_image_dictionary_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image_dictionary' }}"
7676
__sap_vm_provision_os_image_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image' }}"
77+
__sap_vm_provision_os_image_value: "{{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_name) }}"
7778
block:
7879
- name: Assert that the variable {{ __sap_vm_provision_os_image_dictionary_name }} is defined and valid
7980
ansible.builtin.assert:
@@ -88,7 +89,8 @@
8889
- name: Assert that the value of variable {{ __sap_vm_provision_os_image_name }} is present in a dictionary
8990
ansible.builtin.assert:
9091
that:
91-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] is defined
92-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] | length > 0
92+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] is defined
93+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] | length > 0
9394
fail_msg: |
94-
The value of variable {{ __sap_vm_provision_os_image_name }} is not present in a dictionary {{ __sap_vm_provision_os_image_dictionary_name }}.
95+
Invalid value '{{ __sap_vm_provision_os_image_value }}' provided for the variable '{{ __sap_vm_provision_os_image_name }}'.
96+
Available options: {{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name).keys() | list | join(', ') }}

‎roles/sap_vm_provision/tasks/validations/gcp_ce_vm.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
vars:
7070
__sap_vm_provision_os_image_dictionary_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image_dictionary' }}"
7171
__sap_vm_provision_os_image_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image' }}"
72+
__sap_vm_provision_os_image_value: "{{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_name) }}"
7273
block:
7374
- name: Assert that the variable {{ __sap_vm_provision_os_image_dictionary_name }} is defined and valid
7475
ansible.builtin.assert:
@@ -83,7 +84,8 @@
8384
- name: Assert that the value of variable {{ __sap_vm_provision_os_image_name }} is present in a dictionary
8485
ansible.builtin.assert:
8586
that:
86-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] is defined
87-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] | length > 0
87+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] is defined
88+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] | length > 0
8889
fail_msg: |
89-
The value of variable {{ __sap_vm_provision_os_image_name }} is not present in a dictionary {{ __sap_vm_provision_os_image_dictionary_name }}.
90+
Invalid value '{{ __sap_vm_provision_os_image_value }}' provided for the variable '{{ __sap_vm_provision_os_image_name }}'.
91+
Available options: {{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name).keys() | list | join(', ') }}

‎roles/sap_vm_provision/tasks/validations/ibmcloud_powervs.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
vars:
7272
__sap_vm_provision_os_image_dictionary_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image_dictionary' }}"
7373
__sap_vm_provision_os_image_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image' }}"
74+
__sap_vm_provision_os_image_value: "{{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_name) }}"
7475
block:
7576
- name: Assert that the variable {{ __sap_vm_provision_os_image_dictionary_name }} is defined and valid
7677
ansible.builtin.assert:
@@ -85,7 +86,8 @@
8586
- name: Assert that the value of variable {{ __sap_vm_provision_os_image_name }} is present in a dictionary
8687
ansible.builtin.assert:
8788
that:
88-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] is defined
89-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] | length > 0
89+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] is defined
90+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] | length > 0
9091
fail_msg: |
91-
The value of variable {{ __sap_vm_provision_os_image_name }} is not present in a dictionary {{ __sap_vm_provision_os_image_dictionary_name }}.
92+
Invalid value '{{ __sap_vm_provision_os_image_value }}' provided for the variable '{{ __sap_vm_provision_os_image_name }}'.
93+
Available options: {{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name).keys() | list | join(', ') }}

‎roles/sap_vm_provision/tasks/validations/ibmcloud_vs.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
vars:
7373
__sap_vm_provision_os_image_dictionary_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image_dictionary' }}"
7474
__sap_vm_provision_os_image_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image' }}"
75+
__sap_vm_provision_os_image_value: "{{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_name) }}"
7576
block:
7677
- name: Assert that the variable {{ __sap_vm_provision_os_image_dictionary_name }} is defined and valid
7778
ansible.builtin.assert:
@@ -86,7 +87,8 @@
8687
- name: Assert that the value of variable {{ __sap_vm_provision_os_image_name }} is present in a dictionary
8788
ansible.builtin.assert:
8889
that:
89-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] is defined
90-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] | length > 0
90+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] is defined
91+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] | length > 0
9192
fail_msg: |
92-
The value of variable {{ __sap_vm_provision_os_image_name }} is not present in a dictionary {{ __sap_vm_provision_os_image_dictionary_name }}.
93+
Invalid value '{{ __sap_vm_provision_os_image_value }}' provided for the variable '{{ __sap_vm_provision_os_image_name }}'.
94+
Available options: {{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name).keys() | list | join(', ') }}

‎roles/sap_vm_provision/tasks/validations/msazure_vm.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
vars:
7474
__sap_vm_provision_os_image_dictionary_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image_dictionary' }}"
7575
__sap_vm_provision_os_image_name: "{{ 'sap_vm_provision_' ~ sap_vm_provision_iac_platform ~ '_host_os_image' }}"
76+
__sap_vm_provision_os_image_value: "{{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_name) }}"
7677
block:
7778
- name: Assert that the variable {{ __sap_vm_provision_os_image_dictionary_name }} is defined and valid
7879
ansible.builtin.assert:
@@ -87,7 +88,8 @@
8788
- name: Assert that the value of variable {{ __sap_vm_provision_os_image_name }} is present in a dictionary
8889
ansible.builtin.assert:
8990
that:
90-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] is defined
91-
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_name] | length > 0
91+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] is defined
92+
- lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name)[__sap_vm_provision_os_image_value] | length > 0
9293
fail_msg: |
93-
The value of variable {{ __sap_vm_provision_os_image_name }} is not present in a dictionary {{ __sap_vm_provision_os_image_dictionary_name }}.
94+
Invalid value '{{ __sap_vm_provision_os_image_value }}' provided for the variable '{{ __sap_vm_provision_os_image_name }}'.
95+
Available options: {{ lookup('ansible.builtin.vars', __sap_vm_provision_os_image_dictionary_name).keys() | list | join(', ') }}

0 commit comments

Comments
 (0)