diff --git a/.cache/collections/ansible_collections/@NAMESPACE@/@NAME@ b/.cache/collections/ansible_collections/@NAMESPACE@/@NAME@ new file mode 120000 index 000000000..c866b8687 --- /dev/null +++ b/.cache/collections/ansible_collections/@NAMESPACE@/@NAME@ @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/roles/hosted_engine_setup/tasks/add_engine_as_ansible_host.yml b/roles/hosted_engine_setup/tasks/add_engine_as_ansible_host.yml index 90f13b8f1..d9c49c7f0 100644 --- a/roles/hosted_engine_setup/tasks/add_engine_as_ansible_host.yml +++ b/roles/hosted_engine_setup/tasks/add_engine_as_ansible_host.yml @@ -3,7 +3,6 @@ block: - name: Fetch the value of HOST_KEY_CHECKING set_fact: host_key_checking="{{ lookup('config', 'HOST_KEY_CHECKING') }}" - - debug: var=host_key_checking - name: Get the username running the deploy become: false command: whoami diff --git a/roles/hosted_engine_setup/tasks/alter_libvirt_default_net_configuration.yml b/roles/hosted_engine_setup/tasks/alter_libvirt_default_net_configuration.yml index ef813c315..057c4413f 100644 --- a/roles/hosted_engine_setup/tasks/alter_libvirt_default_net_configuration.yml +++ b/roles/hosted_engine_setup/tasks/alter_libvirt_default_net_configuration.yml @@ -4,8 +4,6 @@ command: get_xml name: default register: default_net_xml -- debug: var=default_net_xml.stdout - - name: IPv6 configuration block: - name: Remove IPv4 configuration @@ -34,7 +32,6 @@ attribute: prefix value: "64" register: editednet2 - - debug: var=editednet2 - name: Edit libvirt default network configuration, enable DHCPv6 xml: xmlstring: "{{ editednet2.xmlstring }}" @@ -42,7 +39,6 @@ attribute: start value: "{{ he_ipv6_subnet_prefix + '::10' }}" register: editednet3 - - debug: var=editednet3 - name: Edit libvirt default network configuration, set DHCPv6 range xml: xmlstring: "{{ editednet3.xmlstring }}" @@ -50,7 +46,6 @@ attribute: end value: "{{ he_ipv6_subnet_prefix + '::ff' }}" register: finaledit6 - - debug: var=finaledit when: ipv6_deployment|bool - name: IPv4 configuration diff --git a/roles/hosted_engine_setup/tasks/apply_openscap_profile.yml b/roles/hosted_engine_setup/tasks/apply_openscap_profile.yml index 2763b7cbd..3c9601dfa 100644 --- a/roles/hosted_engine_setup/tasks/apply_openscap_profile.yml +++ b/roles/hosted_engine_setup/tasks/apply_openscap_profile.yml @@ -11,7 +11,6 @@ - name: Set OpenSCAP datastream path set_fact: oscap_datastream: "{{ oscap_dir }}/ssg-{{ oscap_dist | replace('RedHat', 'rhel') | lower }}{{ oscap_ver }}-ds.xml" -- debug: var=oscap_datastream - name: Verify OpenSCAP datastream stat: path: "{{ oscap_datastream }}" @@ -23,7 +22,6 @@ register: oscap_profile changed_when: true when: oscap_ds_stat.stat.exists -- debug: var=oscap_profile - name: Apply OpenSCAP profile command: >- oscap xccdf eval --profile {{ oscap_profile.stdout }} --remediate @@ -44,12 +42,11 @@ command: sysctl -n crypto.fips_enabled changed_when: true register: he_fips_enabled -- debug: var=he_fips_enabled - name: Enforce FIPS mode on CentOS fail: msg: "FIPS mode is unsupported on CentOS" - when: oscap_dist == "CentOS" and he_fips_enabled.stdout != "1" + when: oscap_dist == "CentOS" and he_fips_enabled.stdout != "1" - name: Enforce FIPS mode on Rhel fail: msg: "FIPS mode is not enabled as required" - when: oscap_dist == "RedHat" and he_fips_enabled.stdout != "1" + when: oscap_dist == "RedHat" and he_fips_enabled.stdout != "1" diff --git a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/01_prepare_routing_rules.yml b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/01_prepare_routing_rules.yml index 90697fdf6..ed1c809f1 100644 --- a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/01_prepare_routing_rules.yml +++ b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/01_prepare_routing_rules.yml @@ -23,7 +23,6 @@ name: default state: active register: virt_net_out - - debug: var=virt_net_out - name: Get libvirt interfaces virt_net: command: facts @@ -32,14 +31,12 @@ environment: "{{ he_cmd_lang }}" register: route_rules_ipv4 changed_when: true - - debug: var=route_rules_ipv4 - name: Get routing rules, IPv6 command: ip -6 rule environment: "{{ he_cmd_lang }}" register: route_rules_ipv6 changed_when: true when: ipv6_deployment|bool - - debug: var=route_rules_ipv6 - name: Save bridge name set_fact: virbr_default: "{{ ansible_libvirt_networks['default']['bridge'] }}" @@ -60,7 +57,6 @@ {{ (hostvars[inventory_hostname]['ansible_'+virbr_default]['ipv4']['address']+'/' +hostvars[inventory_hostname]['ansible_'+virbr_default]['ipv4']['netmask']) |ipv4('host/prefix') }} when: not ipv6_deployment|bool - - debug: var=virbr_cidr_ipv4 - name: Fetch IPv6 CIDR for {{ virbr_default }} set_fact: virbr_cidr_ipv6: >- @@ -68,7 +64,6 @@ hostvars[inventory_hostname]['ansible_'+virbr_default]['ipv6'][0]['prefix']) | ipv6('host/prefix') if 'ipv6' in hostvars[inventory_hostname]['ansible_'+virbr_default] else None }} when: ipv6_deployment|bool - - debug: var=virbr_cidr_ipv6 - name: Add IPv4 outbound route rules command: ip rule add from {{ virbr_cidr_ipv4 }} priority 101 table main environment: "{{ he_cmd_lang }}" @@ -80,7 +75,6 @@ selectattr('src', 'equalto', virbr_cidr_ipv4 | ipaddr('address') ) | list | length == 0 changed_when: true - - debug: var=result - name: Add IPv4 inbound route rules command: ip rule add from all to {{ virbr_cidr_ipv4 }} priority 100 table main environment: "{{ he_cmd_lang }}" @@ -92,14 +86,12 @@ selectattr('priority', 'equalto', 100) | selectattr('dst', 'equalto', virbr_cidr_ipv4 | ipaddr('address') ) | list | length == 0 - - debug: var=result - name: Add IPv6 outbound route rules command: ip -6 rule add from {{ virbr_cidr_ipv6 }} priority 101 table main environment: "{{ he_cmd_lang }}" register: result when: ipv6_deployment|bool and "\"101:\tfrom \"+virbr_cidr_ipv6+\" lookup main\" not in route_rules_ipv6.stdout" changed_when: true - - debug: var=result - name: Add IPv6 inbound route rules command: ip -6 rule add from all to {{ virbr_cidr_ipv6 }} priority 100 table main environment: "{{ he_cmd_lang }}" @@ -107,4 +99,3 @@ changed_when: true when: >- ipv6_deployment|bool and "\"100:\tfrom all to \"+virbr_cidr_ipv6+\" lookup main\" not in route_rules_ipv6.stdout" - - debug: var=result diff --git a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/03_engine_initial_tasks.yml b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/03_engine_initial_tasks.yml index 4232ef5c4..15b453d24 100644 --- a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/03_engine_initial_tasks.yml +++ b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/03_engine_initial_tasks.yml @@ -60,7 +60,6 @@ include_tasks: "{{ item }}" with_fileglob: "hooks/enginevm_before_engine_setup/*.yml" register: include_before_engine_setup_results - - debug: var=include_before_engine_setup_results - name: Restore a backup block: - include_tasks: restore_backup.yml diff --git a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/04_engine_final_tasks.yml b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/04_engine_final_tasks.yml index b6cef4934..d78f05eac 100644 --- a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/04_engine_final_tasks.yml +++ b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/04_engine_final_tasks.yml @@ -5,7 +5,6 @@ include_tasks: "{{ item }}" with_fileglob: "hooks/enginevm_after_engine_setup/*.yml" register: include_after_engine_setup_results - - debug: var=include_after_engine_setup_results # After a restart the engine has a 5 minute grace time, # other actions like electing a new SPM host or reconstructing # the master storage domain could require more time @@ -18,7 +17,6 @@ register: libgfapi_support_out changed_when: true when: he_enable_libgfapi|bool - - debug: var=libgfapi_support_out - name: Save original OvfUpdateIntervalInMinutes shell: "engine-config -g OvfUpdateIntervalInMinutes | cut -d' ' -f2 > /root/OvfUpdateIntervalInMinutes.txt" environment: "{{ he_cmd_lang }}" @@ -43,7 +41,6 @@ state: restarted name: ovirt-engine register: restart_out - - debug: var=restart_out - name: Mask cloud-init services to speed up future boot systemd: masked: true diff --git a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/05_add_host.yml b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/05_add_host.yml index 37c6518eb..6ca5030e8 100644 --- a/roles/hosted_engine_setup/tasks/bootstrap_local_vm/05_add_host.yml +++ b/roles/hosted_engine_setup/tasks/bootstrap_local_vm/05_add_host.yml @@ -9,7 +9,6 @@ until: "'DB Up!Welcome to Health Status!' in engine_status.content" retries: 30 delay: 20 - - debug: var=engine_status - name: Open a port on firewalld firewalld: port: "{{ he_webui_forward_port }}/tcp" @@ -27,10 +26,10 @@ async: 86400 poll: 0 register: sshpf - - debug: var=sshpf - name: Evaluate temporary bootstrap engine URL set_fact: bootstrap_engine_url="https://{{ he_host_address }}:{{ he_webui_forward_port }}/ovirt-engine/" - - debug: + - name: Display the temporary bootstrap engine URL + debug: msg: >- The bootstrap engine is temporary accessible over {{ bootstrap_engine_url }} - name: Detect VLAN ID @@ -38,7 +37,6 @@ environment: "{{ he_cmd_lang }}" register: vlan_id_out changed_when: true - - debug: var=vlan_id_out - name: Set Engine public key as authorized key without validating the TLS/SSL certificates authorized_key: user: root @@ -128,7 +126,6 @@ include_tasks: "{{ item }}" with_fileglob: "hooks/after_add_host/*.yml" register: include_after_add_host_results - - debug: var=include_after_add_host_results - name: Pause the execution to let the user interactively reconfigure the host block: - name: Let the user connect to the bootstrap engine to manually fix host configuration @@ -156,7 +153,6 @@ retries: 120 delay: 10 ignore_errors: true - - debug: var=host_result_up_check - name: Notify the user about a failure fail: msg: >- diff --git a/roles/hosted_engine_setup/tasks/clean_localvm_dir.yml b/roles/hosted_engine_setup/tasks/clean_localvm_dir.yml index 181f4453c..b72cbec49 100644 --- a/roles/hosted_engine_setup/tasks/clean_localvm_dir.yml +++ b/roles/hosted_engine_setup/tasks/clean_localvm_dir.yml @@ -4,7 +4,6 @@ path: "{{ he_local_vm_dir }}" state: absent register: rm_localvm_dir -- debug: var=rm_localvm_dir - name: Remove temporary entry in /etc/hosts for the local VM lineinfile: dest: /etc/hosts diff --git a/roles/hosted_engine_setup/tasks/create_storage_domain.yml b/roles/hosted_engine_setup/tasks/create_storage_domain.yml index 59cf2a9ae..34999e13a 100644 --- a/roles/hosted_engine_setup/tasks/create_storage_domain.yml +++ b/roles/hosted_engine_setup/tasks/create_storage_domain.yml @@ -30,19 +30,16 @@ 'up' in host_result.ovirt_hosts[0].status retries: 50 delay: 10 - - debug: var=host_result - name: Fetch cluster ID set_fact: cluster_id="{{ host_result.ovirt_hosts[0].cluster.id }}" - name: Fetch cluster facts ovirt_cluster_info: auth: "{{ ovirt_auth }}" register: cluster_facts - - debug: var=cluster_facts - name: Fetch Datacenter facts ovirt_datacenter_info: auth: "{{ ovirt_auth }}" register: datacenter_facts - - debug: var=datacenter_facts - name: Fetch Datacenter ID set_fact: >- datacenter_id={{ cluster_facts.ovirt_clusters|json_query("[?id=='" + cluster_id + "'].data_center.id")|first }} @@ -119,7 +116,6 @@ pattern: name={{ he_storage_domain_name }} auth: "{{ ovirt_auth }}" register: storage_domain_details - - debug: var=storage_domain_details - name: Find the appliance OVF find: paths: "{{ he_local_vm_dir }}/master" @@ -127,7 +123,6 @@ patterns: ^.*.(?- @@ -178,5 +171,4 @@ auth: "{{ ovirt_auth }}" when: storage_domain_details.ovirt_storage_domains[0].available|int >= required_size|int register: otopi_storage_domain_details - - debug: var=otopi_storage_domain_details ... diff --git a/roles/hosted_engine_setup/tasks/create_target_vm/01_create_target_hosted_engine_vm.yml b/roles/hosted_engine_setup/tasks/create_target_vm/01_create_target_hosted_engine_vm.yml index 9344fedf1..43ca01f9c 100644 --- a/roles/hosted_engine_setup/tasks/create_target_vm/01_create_target_hosted_engine_vm.yml +++ b/roles/hosted_engine_setup/tasks/create_target_vm/01_create_target_hosted_engine_vm.yml @@ -8,7 +8,6 @@ environment: "{{ he_cmd_lang }}" register: local_vm_ip changed_when: true - - debug: var=local_vm_ip - name: Fetch host facts ovirt_host_info: pattern: name={{ he_host_name }} status=up @@ -17,19 +16,16 @@ until: host_result is succeeded and host_result.ovirt_hosts|length >= 1 retries: 50 delay: 10 - - debug: var=host_result - name: Fetch Cluster ID set_fact: cluster_id="{{ host_result.ovirt_hosts[0].cluster.id }}" - name: Fetch Cluster facts ovirt_cluster_info: auth: "{{ ovirt_auth }}" register: cluster_facts - - debug: var=cluster_facts - name: Fetch Datacenter facts ovirt_datacenter_info: auth: "{{ ovirt_auth }}" register: datacenter_facts - - debug: var=datacenter_facts - name: Fetch Cluster name set_fact: cluster_name={{ cluster_facts.ovirt_clusters|json_query("[?id=='" + cluster_id + "'].name")|first }} - name: Fetch Datacenter ID @@ -51,7 +47,6 @@ name: ServerCPUList version: "{{ cluster_version.major }}.{{ cluster_version.minor }}" register: server_cpu_list - - debug: var=server_cpu_list - name: Get cluster emulated machine list ovirt_system_option_info: name: ClusterEmulatedMachines @@ -66,11 +61,9 @@ server_cpu_dict: "{{ server_cpu_dict | combine({item.split(':')[1]: item.split(':')[3]}) }}" with_items: >- {{ server_cpu_list['ovirt_system_option']['values'][0]['value'].split('; ')|list|difference(['']) }} - - debug: var=server_cpu_dict - name: Convert CPU model name set_fact: cluster_cpu_model: "{{ server_cpu_dict[cluster_cpu.type] }}" - - debug: var=cluster_cpu_model - name: Parse emulated_machine set_fact: emulated_machine: >- @@ -81,7 +74,6 @@ pattern: name={{ he_storage_domain_name }} and datacenter={{ datacenter_name }} auth: "{{ ovirt_auth }}" register: storage_domain_details - - debug: var=storage_domain_details - name: Add HE disks ovirt_disk: name: "{{ item.name }}" @@ -135,19 +127,16 @@ he_sanlock_disk_details: "{{ add_disks.results[1] }}" he_conf_disk_details: "{{ add_disks.results[2] }}" he_metadata_disk_details: "{{ add_disks.results[3] }}" - - debug: var=add_disks - name: Set default graphics protocols set_fact: he_graphic_protocols: [vnc, spice] - name: Check if FIPS is enabled command: sysctl -n crypto.fips_enabled register: he_fips_enabled - - debug: var=he_fips_enabled - name: Select graphic protocols set_fact: he_graphic_protocols: [spice] when: he_fips_enabled.stdout == "1" - - debug: var=he_graphic_protocols - name: Add VM ovirt_vm: state: stopped @@ -177,10 +166,8 @@ mac_address: "{{ he_vm_mac_addr }}" auth: "{{ ovirt_auth }}" register: he_vm_details - - debug: var=he_vm_details - name: Register external local VM uuid shell: virsh -r domuuid {{ he_vm_name }}Local | head -1 environment: "{{ he_cmd_lang }}" register: external_local_vm_uuid changed_when: true - - debug: var=external_local_vm_uuid diff --git a/roles/hosted_engine_setup/tasks/create_target_vm/02_engine_vm_configuration.yml b/roles/hosted_engine_setup/tasks/create_target_vm/02_engine_vm_configuration.yml index 269756e94..2fe763ef6 100644 --- a/roles/hosted_engine_setup/tasks/create_target_vm/02_engine_vm_configuration.yml +++ b/roles/hosted_engine_setup/tasks/create_target_vm/02_engine_vm_configuration.yml @@ -21,7 +21,6 @@ register: db_vm_update with_items: - {field: 'origin', value: 6} - - debug: var=db_vm_update - name: Insert Hosted Engine configuration disk uuid into Engine database command: >- psql -d engine -c @@ -34,7 +33,6 @@ become_method: sudo changed_when: true register: db_conf_update - - debug: var=db_conf_update - name: Fetch host SPM_ID command: >- psql -t -d engine -c @@ -47,7 +45,6 @@ register: host_spm_id_out - name: Parse host SPM_ID set_fact: host_spm_id="{{ host_spm_id_out.stdout_lines|first|trim }}" - - debug: var=host_spm_id - name: Restore original DisableFenceAtStartupInSec shell: "engine-config -s DisableFenceAtStartupInSec=$(cat /root/DisableFenceAtStartupInSec.txt)" environment: "{{ he_cmd_lang }}" diff --git a/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml b/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml index 8c0e0f887..f7e4d15cd 100644 --- a/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml +++ b/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml @@ -22,13 +22,11 @@ delay: 10 register: storage_domain_details until: "storage_domain_details.ovirt_storage_domains[0].disks | selectattr('name', 'match', '^OVF_STORE$') | list" - - debug: var=storage_domain_details - name: Parse OVF_STORE disk list set_fact: ovf_store_disks: >- {{ storage_domain_details.ovirt_storage_domains[0].disks | selectattr('name', 'match', '^OVF_STORE$') | list }} - - debug: var=ovf_store_disks - name: Check OVF_STORE volume status command: >- vdsm-client Volume getInfo storagepoolID={{ datacenter_id }} @@ -43,7 +41,6 @@ ovf_store_status.rc == 0 and ovf_store_status.stdout|from_json|json_query('status') == 'OK' and ovf_store_status.stdout|from_json|json_query('description')|from_json|json_query('Updated') with_items: "{{ ovf_store_disks }}" - - debug: var=ovf_store_status - name: Wait for OVF_STORE disk content shell: >- vdsm-client Image prepare storagepoolID={{ datacenter_id }} @@ -72,7 +69,6 @@ - "{{ he_sanlock_disk_details }}" register: prepareimage_results changed_when: true - - debug: var=prepareimage_results - name: Fetch Hosted Engine configuration disk path set_fact: he_conf_disk_path: >- @@ -88,9 +84,6 @@ he_metadata_disk_path: >- {{ (prepareimage_results.results|json_query("[?item.id=='" + he_metadata_disk_details.id + "'].stdout")|first|from_json).path }} - - debug: var=he_conf_disk_path - - debug: var=he_virtio_disk_path - - debug: var=he_metadata_disk_path - name: Shutdown local VM command: "virsh -c qemu:///system?authfile={{ he_libvirt_authfile }} shutdown {{ he_vm_name }}Local" environment: "{{ he_cmd_lang }}" @@ -102,7 +95,6 @@ until: dominfo_out.rc == 0 and 'shut off' in dominfo_out.stdout retries: 120 delay: 5 - - debug: var=dominfo_out - name: Undefine local VM command: "virsh -c qemu:///system?authfile={{ he_libvirt_authfile }} undefine {{ he_vm_name }}Local" environment: "{{ he_cmd_lang }}" @@ -122,7 +114,6 @@ changed_when: true - name: Set ha_version set_fact: ha_version="{{ ha_version_out.stdout_lines|first }}" - - debug: var=ha_version - name: Create configuration templates template: src: "{{ item.src }}" @@ -283,7 +274,6 @@ retries: 5 delay: 10 changed_when: true - - debug: var=result - block: - name: Workaround for ovirt-ha-broker start failures # Ugly workaround for https://bugzilla.redhat.com/1768511 @@ -315,7 +305,6 @@ retries: 3 delay: 10 changed_when: true - - debug: var=mresult - name: Wait for the engine to come up on the target VM block: - name: Check engine VM health @@ -428,4 +417,3 @@ include_tasks: "{{ item }}" with_fileglob: "hooks/after_setup/*.yml" register: after_setup_results - - debug: var=after_setup_results diff --git a/roles/hosted_engine_setup/tasks/fc_getdevices.yml b/roles/hosted_engine_setup/tasks/fc_getdevices.yml index b5ca3f76f..bcf55fbd5 100644 --- a/roles/hosted_engine_setup/tasks/fc_getdevices.yml +++ b/roles/hosted_engine_setup/tasks/fc_getdevices.yml @@ -7,5 +7,4 @@ lun_id: -1 # currently it is unused and I use it to turn on FC filtering auth: "{{ ovirt_auth }}" register: otopi_fc_devices -- debug: var=otopi_fc_devices ... diff --git a/roles/hosted_engine_setup/tasks/fetch_host_ip.yml b/roles/hosted_engine_setup/tasks/fetch_host_ip.yml index bd6a45310..4b3a0f206 100644 --- a/roles/hosted_engine_setup/tasks/fetch_host_ip.yml +++ b/roles/hosted_engine_setup/tasks/fetch_host_ip.yml @@ -7,13 +7,10 @@ set_fact: he_host_name: "{{ host_full_name.stdout_lines[0] }}" when: he_host_name is none -- debug: var=he_host_name - name: Define host address variable if not defined set_fact: he_host_address: "{{ host_full_name.stdout_lines[0] }}" when: he_host_address is none -- debug: var=he_host_address - - name: Get host IP address block: - name: Choose IPv4, IPv6 or auto @@ -23,7 +20,6 @@ register: hostname_resolution_output changed_when: true ignore_errors: true - - debug: var=hostname_resolution_output - name: Check address resolution fail: msg: > @@ -39,8 +35,6 @@ ) )[0] }}" - - debug: var=he_host_ip - - name: Fail if host's ip is empty fail: msg: Host has no IP address diff --git a/roles/hosted_engine_setup/tasks/filter_unsupported_devices.yml b/roles/hosted_engine_setup/tasks/filter_unsupported_devices.yml index 9ca14ead7..cc3deba71 100644 --- a/roles/hosted_engine_setup/tasks/filter_unsupported_devices.yml +++ b/roles/hosted_engine_setup/tasks/filter_unsupported_devices.yml @@ -7,7 +7,6 @@ loop_var: nic changed_when: true register: interface_types -- debug: var=interface_types - name: Check for Team devices set_fact: is_team: "{{ nic_if.stdout.find('team') > 0 }}" @@ -17,17 +16,14 @@ loop_control: loop_var: nic_if register: team_list -- debug: var=team_list - name: Get list of Team devices set_fact: team_if: "{{ team_list.results | reject('skipped') | map(attribute='nic_if.nic') | list }}" -- debug: var=team_if - import_tasks: filter_unsupported_vlan_devices.yml - name: Filter unsupported interface types set_fact: otopi_host_net: "{{ host_net | difference(invalid_net_if) }}" register: otopi_host_net -- debug: var=otopi_host_net - name: Failed if only unsupported devices are available fail: msg: >- diff --git a/roles/hosted_engine_setup/tasks/filter_unsupported_vlan_devices.yml b/roles/hosted_engine_setup/tasks/filter_unsupported_vlan_devices.yml index 72e5384ee..2dc74fa69 100644 --- a/roles/hosted_engine_setup/tasks/filter_unsupported_vlan_devices.yml +++ b/roles/hosted_engine_setup/tasks/filter_unsupported_vlan_devices.yml @@ -8,7 +8,6 @@ loop_control: loop_var: nic_if register: vlan_list -- debug: var=vlan_list - name: Check for base interface of VLAN devices command: nmcli -g VLAN.PARENT device show {{ vlan_device.nic_if.nic }} when: vlan_device.ansible_facts is defined and vlan_device.ansible_facts.is_vlan @@ -17,7 +16,6 @@ loop_control: loop_var: vlan_device register: vlan_base_interfaces -- debug: var=vlan_base_interfaces - name: Get base interface types of VLAN devices command: nmcli -g GENERAL.TYPE device show {{ vlan_base_interface.stdout }} when: vlan_base_interface.skipped is undefined and vlan_base_interface.stdout is defined @@ -26,7 +24,6 @@ loop_control: loop_var: vlan_base_interface register: vlan_base_types -- debug: var=vlan_base_types - name: Check for bond as base type of VLAN device set_fact: bond_parent: "{{ vlan_base_type.vlan_base_interface.stdout }}" @@ -36,7 +33,6 @@ loop_control: loop_var: vlan_base_type register: vlan_bond_list -- debug: var=vlan_bond_list - name: Check if bond base interface of VLAN device is in supported mode set_fact: bond_parent_mode: "{{ hostvars[inventory_hostname]['ansible_' + vlan_bond_device.ansible_facts.bond_parent]['mode'] }}" @@ -46,7 +42,6 @@ loop_control: loop_var: vlan_bond_device register: vlan_bond_valid_mode_list -- debug: var=vlan_bond_valid_mode_list - name: Collect VLAN devices with bad bond mode base interfaces set_fact: bbm_vlan: "{{ vlan_bond_item.ansible_facts.vlan_bond_valid_if }}" @@ -56,12 +51,9 @@ loop_control: loop_var: vlan_bond_item register: bbm_vlan_list -- debug: var=bbm_vlan_list - name: Generate invalid VLANs list set_fact: bad_vlan_bond_list: "{{ bbm_vlan_list.results | reject('skipped') | map(attribute='vlan_bond_item.ansible_facts.vlan_bond_valid_if') | list }}" -- debug: var=bad_vlan_bond_list - name: Create list of unsupported network devices set_fact: invalid_net_if: "{{ bad_vlan_bond_list + team_if }}" -- debug: var=invalid_net_if diff --git a/roles/hosted_engine_setup/tasks/get_local_vm_disk_path.yml b/roles/hosted_engine_setup/tasks/get_local_vm_disk_path.yml index c64702813..f9d3143e5 100644 --- a/roles/hosted_engine_setup/tasks/get_local_vm_disk_path.yml +++ b/roles/hosted_engine_setup/tasks/get_local_vm_disk_path.yml @@ -6,7 +6,6 @@ patterns: ^.*.(?= 1 retries: 50 delay: 10 -- debug: var=host_result - name: iSCSI discover with REST API uri: url: https://{{ he_fqdn }}/ovirt-engine/api/hosts/{{ host_result.ovirt_hosts[0].id }}/iscsidiscover @@ -32,7 +31,6 @@ Accept: application/json Authorization: "Basic {{ ('admin@internal' + ':' + he_admin_password ) | b64encode }}" register: otopi_iscsi_targets -- debug: var=otopi_iscsi_targets # TODO: perform an iSCSI logout when viable, see: # https://bugzilla.redhat.com/show_bug.cgi?id=1535951 # https://github.com/ansible/ansible/issues/35039 diff --git a/roles/hosted_engine_setup/tasks/iscsi_getdevices.yml b/roles/hosted_engine_setup/tasks/iscsi_getdevices.yml index dd909a65f..4bc0754d8 100644 --- a/roles/hosted_engine_setup/tasks/iscsi_getdevices.yml +++ b/roles/hosted_engine_setup/tasks/iscsi_getdevices.yml @@ -30,5 +30,4 @@ target: "{{ he_iscsi_target }}" auth: "{{ ovirt_auth }}" register: otopi_iscsi_devices -- debug: var=otopi_iscsi_devices ... diff --git a/roles/hosted_engine_setup/tasks/pre_checks/001_validate_network_interfaces.yml b/roles/hosted_engine_setup/tasks/pre_checks/001_validate_network_interfaces.yml index 788f91651..3707279c2 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/001_validate_network_interfaces.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/001_validate_network_interfaces.yml @@ -10,11 +10,9 @@ - 'rhevm' loop_control: loop_var: bridge_name - - debug: var=bridge_interface - name: Set variable for supported bond modes set_fact: acceptable_bond_modes: ['active-backup', 'balance-xor', 'broadcast', '802.3ad'] - - debug: var=acceptable_bond_modes - name: Get all active network interfaces set_fact: otopi_net_host="{{ hostvars[inventory_hostname]['ansible_' + iface_item]['device'] }}" @@ -52,7 +50,6 @@ loop_control: loop_var: iface_item register: valid_network_interfaces - - debug: var=valid_network_interfaces - name: Filter bonds with bad naming set_fact: net_iface="{{ bond_item }}" @@ -64,13 +61,11 @@ loop_control: loop_var: bond_item register: bb_filtered_list - - debug: var=bb_filtered_list - name: Generate output list set_fact: host_net: >- {{ [bridge_interface] if bridge_interface is defined else bb_filtered_list.results | reject('skipped') | map(attribute='bond_item.ansible_facts.otopi_net_host') | list }} - - debug: var=host_net - import_tasks: filter_unsupported_devices.yml - name: Validate selected bridge interface if management bridge does not exist fail: diff --git a/roles/hosted_engine_setup/tasks/pre_checks/002_validate_hostname_tasks.yml b/roles/hosted_engine_setup/tasks/pre_checks/002_validate_hostname_tasks.yml index 898701a9b..22995cdb5 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/002_validate_hostname_tasks.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/002_validate_hostname_tasks.yml @@ -89,7 +89,6 @@ register: fqdn_resolution_output changed_when: true ignore_errors: true - - debug: var=fqdn_resolution_output - name: Check engine he_fqdn resolution fail: msg: > @@ -98,7 +97,6 @@ - name: Parse engine he_fqdn resolution set_fact: r_fqdn_address: "{{ fqdn_resolution_output.stdout.split()[0] }}" - - debug: var=r_fqdn_address - name: Ensure engine he_fqdn doesn't resolve locally fail: msg: > diff --git a/roles/hosted_engine_setup/tasks/pre_checks/define_variables.yml b/roles/hosted_engine_setup/tasks/pre_checks/define_variables.yml index 64086ee8f..c5c809bf2 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/define_variables.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/define_variables.yml @@ -11,13 +11,9 @@ set_fact: he_cloud_init_domain_name: "{{ host_domain_name.stdout_lines[0] if host_domain_name.stdout_lines else '' }}" when: he_cloud_init_domain_name is not defined - - debug: var=he_cloud_init_domain_name - - name: Define he_cloud_init_host_name set_fact: he_cloud_init_host_name: "{{ he_fqdn }}" - - debug: var=he_cloud_init_host_name - - name: Define he_vm_uuid block: - name: Get uuid @@ -27,8 +23,6 @@ - name: Set he_vm_uuid set_fact: he_vm_uuid: "{{ uuid.stdout }}" - - debug: var=he_vm_uuid - - name: Define he_nic_uuid block: - name: Get uuid @@ -38,8 +32,6 @@ - name: Set he_nic_uuid set_fact: he_nic_uuid: "{{ uuid.stdout }}" - - debug: var=he_nic_uuid - - name: Define he_cdrom_uuid block: - name: Get uuid @@ -49,8 +41,6 @@ - name: Set he_cdrom_uuid set_fact: he_cdrom_uuid: "{{ uuid.stdout }}" - - debug: var=he_cdrom_uuid - - name: Define Timezone block: - name: get timezone @@ -60,4 +50,3 @@ - name: Set he_time_zone set_fact: he_time_zone: "{{ timezone.stdout }}" - - debug: var=he_time_zone diff --git a/roles/hosted_engine_setup/tasks/pre_checks/validate_gateway.yml b/roles/hosted_engine_setup/tasks/pre_checks/validate_gateway.yml index 85496b97d..302e531a9 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/validate_gateway.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/validate_gateway.yml @@ -6,13 +6,11 @@ changed_when: true register: get_gateway_4 when: he_default_gateway_4 is not defined or he_default_gateway_4 is none or not he_default_gateway_4 - - debug: var=get_gateway_4 - name: Get default gateway IPv6 shell: ip -6 r | grep default | awk '{print $3}' changed_when: true register: get_gateway_6 when: he_default_gateway_6 is not defined or he_default_gateway_6 is none or not he_default_gateway_6 - - debug: var=get_gateway_6 - name: Set he_gateway set_fact: he_gateway: >- @@ -21,8 +19,6 @@ '' }} when: he_gateway is not defined or he_gateway is none or not he_gateway|trim - - debug: var=he_gateway - - name: Fail if there is no gateway fail: msg: "No default gateway is defined" diff --git a/roles/hosted_engine_setup/tasks/pre_checks/validate_mac_address.yml b/roles/hosted_engine_setup/tasks/pre_checks/validate_mac_address.yml index c09537f9e..c9b3e3dc2 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/validate_mac_address.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/validate_mac_address.yml @@ -5,7 +5,6 @@ shell: od -An -N6 -tx1 /dev/urandom | sed -e 's/^ *//' -e 's/ */:/g' -e 's/:$//' -e 's/^\(.\)[13579bdf]/\10/' changed_when: true register: mac_address - - debug: var=mac_address - name: Set he_vm_mac_addr set_fact: he_vm_mac_addr: >- @@ -14,4 +13,3 @@ fail: msg: "Invalid unicast MAC address format. Got {{ he_vm_mac_addr }}" when: not he_vm_mac_addr | regex_search( "^[a-fA-F0-9][02468aAcCeE](:[a-fA-F0-9]{2}){5}$" ) -- debug: var=he_vm_mac_addr diff --git a/roles/hosted_engine_setup/tasks/pre_checks/validate_memory_size.yml b/roles/hosted_engine_setup/tasks/pre_checks/validate_memory_size.yml index 4edddd8e8..c5d1a4503 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/validate_memory_size.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/validate_memory_size.yml @@ -5,22 +5,16 @@ shell: free -m | grep Mem | awk '{print $4}' changed_when: true register: free_mem - - debug: var=free_mem - name: Get cached memory shell: free -m | grep Mem | awk '{print $6}' changed_when: true register: cached_mem - - debug: var=cached_mem - name: Set Max memory set_fact: max_mem: "{{ free_mem.stdout|int + cached_mem.stdout|int - he_reserved_memory_MB + he_avail_memory_grace_MB }}" - - debug: var=max_mem - - name: set he_mem_size_MB to max available if not defined set_fact: he_mem_size_MB: "{{ he_mem_size_MB if he_mem_size_MB != 'max' else max_mem }}" -- debug: var=he_mem_size_MB - - name: Fail if available memory is less then the minimal requirement fail: msg: >- @@ -29,25 +23,21 @@ engine VM. when: >- he_requirements_check_enabled and he_memory_requirements_check_enabled and max_mem|int < he_minimal_mem_size_MB|int - - name: Fail if user chose less memory then the minimal requirement fail: msg: "Memory size must be at least {{ he_minimal_mem_size_MB }}MB, while you selected only {{ he_mem_size_MB }}MB" when: >- he_requirements_check_enabled and he_memory_requirements_check_enabled and he_minimal_mem_size_MB|int > he_mem_size_MB|int - - name: Fail if user chose more memory then the available memory fail: msg: >- Not enough memory! {{ he_mem_size_MB }}MB, while only {{ max_mem }}MB are available on the host. Be aware that {{ he_reserved_memory_MB }}MB is reserved for the host and cannot be allocated to the engine VM. - when: >- he_requirements_check_enabled and he_memory_requirements_check_enabled and he_mem_size_MB|int > max_mem|int - - name: Fail if he_disk_size_GB is smaller then the minimal requirement fail: msg: "Disk size too small: ({{ he_disk_size_GB }}GB), disk size must be at least {{ he_minimal_disk_size_GB }}GB" diff --git a/roles/hosted_engine_setup/tasks/pre_checks/validate_network_test.yml b/roles/hosted_engine_setup/tasks/pre_checks/validate_network_test.yml index 6c8354c47..70ecb7843 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/validate_network_test.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/validate_network_test.yml @@ -1,7 +1,6 @@ --- - name: Validate network connectivity check configuration block: - - debug: var=he_network_test - name: Fail if he_network_test is not valid fail: msg: "Invalid he_network_test defined" diff --git a/roles/hosted_engine_setup/tasks/pre_checks/validate_vcpus_count.yml b/roles/hosted_engine_setup/tasks/pre_checks/validate_vcpus_count.yml index a9d794428..96822c0e7 100644 --- a/roles/hosted_engine_setup/tasks/pre_checks/validate_vcpus_count.yml +++ b/roles/hosted_engine_setup/tasks/pre_checks/validate_vcpus_count.yml @@ -8,13 +8,9 @@ - name: Set he_maxvcpus set_fact: he_maxvcpus: "{{ max_cpus.stdout }}" - - debug: var=he_maxvcpus - - name: Set he_vcpus to maximum amount if not defined set_fact: he_vcpus: "{{ he_vcpus if he_vcpus != 'max' else he_maxvcpus }}" -- debug: var=he_vcpus - - name: Check number of chosen CPUs fail: msg: "Invalid number of cpu specified: {{ he_vcpus }}, while only {{ he_maxvcpus }} are available on the host" diff --git a/roles/hosted_engine_setup/tasks/restore_backup.yml b/roles/hosted_engine_setup/tasks/restore_backup.yml index c5231d8c6..75a78aa98 100644 --- a/roles/hosted_engine_setup/tasks/restore_backup.yml +++ b/roles/hosted_engine_setup/tasks/restore_backup.yml @@ -14,7 +14,6 @@ environment: "{{ he_cmd_lang }}" register: engine_restore_out changed_when: true -- debug: var=engine_restore_out - name: Remove backup file file: state: absent @@ -40,7 +39,6 @@ become_method: sudo changed_when: true register: db_update_host_vms -- debug: var=db_update_host_vms - name: Update dynamic data for VMs migrating to the host used to redeploy command: >- psql -d engine -c @@ -53,7 +51,6 @@ become_method: sudo changed_when: true register: db_update_host_migrating_vms -- debug: var=db_update_host_migrating_vms - name: Remove host used to redeploy command: >- psql -d engine -c @@ -66,7 +63,6 @@ become_method: sudo changed_when: true register: db_remove_he_host -- debug: var=db_remove_he_host - name: Rename previous HE storage domain to avoid name conflicts command: >- psql -d engine -c @@ -79,7 +75,6 @@ become_method: sudo changed_when: true register: db_rename_he_sd -- debug: var=db_rename_he_sd - name: Save original DisableFenceAtStartupInSec shell: >- set -euo pipefail && engine-config -g DisableFenceAtStartupInSec | diff --git a/roles/hosted_engine_setup/tasks/search_available_network_subnet.yaml b/roles/hosted_engine_setup/tasks/search_available_network_subnet.yaml index 4cb020865..912ad6c16 100644 --- a/roles/hosted_engine_setup/tasks/search_available_network_subnet.yaml +++ b/roles/hosted_engine_setup/tasks/search_available_network_subnet.yaml @@ -8,11 +8,9 @@ - name: Set 3rd chunk set_fact: chunk: "{{ chunk|int + 1 }}" - - debug: var=chunk - name: Get ip route shell: ip route get 192.168.{{ chunk }}.1 | grep "via" | cat register: result - - debug: var=result - name: Fail if can't find an available subnet fail: msg: >- @@ -28,7 +26,6 @@ include_tasks: search_available_network_subnet.yaml when: result.stdout.find("via") == -1 when: not ipv6_deployment|bool - - name: Search for an available IPv6 subnet block: - name: Define 3rd chunk @@ -38,11 +35,9 @@ - name: Set 3rd chunk set_fact: chunk: "{{ chunk|int + 45 }}" # 200 tries - - debug: var=chunk - name: Get ip route shell: ip -6 route get fd00:1234:{{ chunk }}:900::1 | grep "via" | cat register: result - - debug: var=result - name: Fail if can't find an available subnet fail: msg: >- diff --git a/roles/hosted_engine_setup/tasks/sync_on_engine_machine.yml b/roles/hosted_engine_setup/tasks/sync_on_engine_machine.yml index f4acaea6d..6ff35bf67 100644 --- a/roles/hosted_engine_setup/tasks/sync_on_engine_machine.yml +++ b/roles/hosted_engine_setup/tasks/sync_on_engine_machine.yml @@ -5,5 +5,5 @@ command: sync changed_when: true ignore_errors: true - ignore_unreachable: yes + ignore_unreachable: true delegate_to: "{{ groups.engine[0] }}"