diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 68dedd7274..8a4a5cc7c1 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -26,6 +26,7 @@ - fas_client - collectd/base - { role: iscsi_client, when: "inventory_hostname.startswith(('bvirthost', 'buildvmhost-0'))" } + - { role: iscsi_client, when: "inventory_hostname.startswith(('bvmhost-x86-06', 'bvmhost-x86-07'))" and datacenter == 'iad2' } - sudo - { role: openvpn/client, when: vpn|bool } - virthost diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml index 336dd76110..22eb336827 100644 --- a/roles/iscsi_client/tasks/main.yml +++ b/roles/iscsi_client/tasks/main.yml @@ -53,11 +53,23 @@ tags: - config -- name: run iscsiadm command for initial connect to vtap-fedora-iscsi01 +- name: set up iscsi interface for EL8 + command: creates=/var/lib/iscsi/ifaces/{{ netapp_iscsi_interface_iad2 }} iscsiadm -m iface -I {{ netapp_iscsi_interface_iad2 }} --op=new + when: ansible_distribution_major_version|int >= 8 and ansible_distribution == "RedHat" and datacenter == 'iad2' + tags: + - config + +- name: run iscsiadm command for initial connect to PHX2 vtap-fedora-iscsi01 command: creates=/var/lib/iscsi/nodes/{{ netapp_iscsi_name }}/{{ netapp_iscsi_portal }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_iscsi_portal }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_iscsi_name }} --portal {{ netapp_iscsi_portal }} --login tags: - config +- name: run iscsiadm command for initial connect to IAD2 vtap-fedora-iscsi01 + command: creates=/var/lib/iscsi/nodes/{{ netapp_iscsi_name_iad2 }}/{{ netapp_iscsi_portal_iad2 }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_iscsi_portal_iad2 }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_iscsi_name_iad2 }} --portal {{ netapp_iscsi_portal_iad2 }} --login + when: ansible_distribution_major_version|int >= 8 and ansible_distribution == "RedHat" and datacenter == 'iad2' + tags: + - config + #- name: run iscsiadm command for initial connect to vtap-fedora-nfs01 # command: creates=/var/lib/iscsi/nodes/{{ netapp_nfs01_iscsi_name }}/{{ netapp_nfs01_iscsi_portal }},3260 /sbin/iscsiadm --mode node --targetname --portal {{ netapp_nfs01_iscsi_portal }} -o new ; /sbin/iscsiadm --mode node --targetname {{ netapp_nfs01_iscsi_name }} --portal {{ netapp_nfs01_iscsi_portal }} --login # tags: diff --git a/roles/iscsi_client/vars/main.yml b/roles/iscsi_client/vars/main.yml index 96d77a97c9..f590323c45 100644 --- a/roles/iscsi_client/vars/main.yml +++ b/roles/iscsi_client/vars/main.yml @@ -3,3 +3,7 @@ netapp_iscsi_name: iqn.1992-08.com.netapp:sn.8a2c2d9073de11e4a645123478563412:vs # iscsi portal for netapp iscsi volume netapp_iscsi_portal: 10.5.88.56 +# iscsi initiator for netapp iscsi volume +netapp_iscsi_name_iad2: iqn.1992-08.com.netapp:sn.cd436d978abd11eaba39d039ea14e9fa:vs.5 +# iscsi portal for netapp iscsi volume +netapp_iscsi_portal_iad2: 10.3.177.12