Move iSCSI config to the iSCSI playbooks
Change-Id: Id16bd2fa16933112c77b3084b3c925c60ba47f25
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml b/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
index 42554d1..6fcc0f0 100644
--- a/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
+++ b/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
@@ -180,16 +180,12 @@
port_node_1_sp_api_mac: "{{ hostvars['undercloud-client']['port_node_1_sp_api_mac'] }}"
sp_sp0_mac: "{{ hostvars['undercloud-client']['port_sp0_mac'] }}"
sp_sp1_mac: "{{ hostvars['undercloud-client']['port_sp1_mac'] }}"
- sp_iscsi0_mac: "{{ hostvars['undercloud-client']['port_node_1_iscsi0_mac'] }}"
- sp_iscsi1_mac: "{{ hostvars['undercloud-client']['port_node_1_iscsi1_mac'] }}"
- ip_node_1_iscsi0: "{{ hostvars['undercloud-client']['ip_node_1_iscsi0'] }}/24"
- ip_node_1_iscsi1: "{{ hostvars['undercloud-client']['ip_node_1_iscsi1'] }}/24"
ip_node_1_sp_api: "{{ ip_node_1_sp_api }}/24"
ip_sp0: "{{ ip_sp0 }}/24"
ip_sp1: "{{ ip_sp1 }}/24"
- set_fact:
- storpool_netplan: "{{ hostvars['localhost'].STORPOOL_NETPLAN.v }}"
+ storpool_netplan: "{{ hostvars['localhost'].STORPOOL_STORPOOL_NETPLAN.v }}"
no_log: true
- name: Provision the Netplan Template
@@ -197,7 +193,7 @@
become: true
ansible.builtin.copy:
content: "{{ storpool_netplan }}"
- dest: /etc/netplan/60-storpool.yaml
+ dest: /etc/netplan/61-storpool.yaml
- set_fact:
ip_node_1_sp_api: "{{ ip_sp_api_wo_net }}"
@@ -212,19 +208,6 @@
ansible.builtin.command:
argv: ["netplan", "apply"]
- - name: Create Service to Apply Interface Configuration on Boot
- no_log: true
- become: true
- ansible.builtin.copy:
- content: "{{ hostvars['localhost'].STORPOOL_NETPLAN_SERVICE.v }}"
- dest: /etc/systemd/system/netplan-fix.service
-
- - name: Enable Service to Apply Interface Configuration on Boot
- no_log: true
- become: true
- ansible.builtin.command:
- argv: [ "systemctl", "enable", "netplan-fix" ]
-
- name: Provision StorPool Deployment Configuration
no_log: true
ansible.builtin.lineinfile:
@@ -415,41 +398,7 @@
- set_fact:
port_node_2_sp_api_mac: "{{ hostvars['undercloud-client']['port_node_2_sp_api_mac'] }}"
- mac_node_2_iscsi0: "{{ hostvars['undercloud-client']['port_node_2_iscsi0_mac'] }}"
- mac_node_2_iscsi1: "{{ hostvars['undercloud-client']['port_node_2_iscsi1_mac'] }}"
ip_node_2_sp_api: "{{ ip_node_2_sp_api }}/24"
- ip_node_2_iscsi0: "{{ hostvars['undercloud-client']['ip_node_2_iscsi0'] }}/24"
- ip_node_2_iscsi1: "{{ hostvars['undercloud-client']['ip_node_2_iscsi1'] }}/24"
-
- - set_fact:
- iscsi_mac: "{{ mac_node_2_iscsi0 }}"
- iscsi_ip: "{{ ip_node_2_iscsi0 }}"
-
- - set_fact:
- systemd_networkd_iscsi: "{{ hostvars['localhost'].ISCSI_NODE_SYSTEMD_NETWORKD.v }}"
- no_log: true
-
- - name: Provision the Netplan Template for iSCSI Network 1
- no_log: true
- become: true
- ansible.builtin.copy:
- content: "{{ systemd_networkd_iscsi }}"
- dest: /etc/systemd/network/60-storpool-iscsi-1.network
-
- - set_fact:
- iscsi_ip: "{{ ip_node_2_iscsi1 }}"
- iscsi_mac: "{{ mac_node_2_iscsi1 }}"
-
- - set_fact:
- systemd_networkd_iscsi: "{{ hostvars['localhost'].ISCSI_NODE_SYSTEMD_NETWORKD.v }}"
- no_log: true
-
- - name: Provision the Netplan Template for iSCSI Network 2
- no_log: true
- become: true
- ansible.builtin.copy:
- content: "{{ systemd_networkd_iscsi }}"
- dest: /etc/systemd/network/61-storpool-iscsi-2.network
- set_fact:
iscsi_ip: "{{ ip_node_2_sp_api }}"
@@ -493,17 +442,3 @@
argv: [ "ping", "-c1", "192.168.50.101" ]
register: r
until: r.rc == 0
-
- - name: Set multipath.conf user_friendly_names to no
- become: true
- ansible.builtin.copy:
- content: "defaults {\n user_friendly_names no\n getuid_callout \"/lib/udev/scsi_id --whitelisted --device=/dev/%n\"\n}\n"
- dest: "/etc/multipath.conf"
- owner: root
- group: root
- mode: '0644'
-
- - name: Restart multipathd
- become: true
- ansible.builtin.command:
- argv: [ "systemctl", "restart", "multipathd" ]
diff --git a/playbooks/setup-openstack-iscsi-multipath/pre.yaml b/playbooks/setup-openstack-iscsi-multipath/pre.yaml
index cb1c099..a48486b 100644
--- a/playbooks/setup-openstack-iscsi-multipath/pre.yaml
+++ b/playbooks/setup-openstack-iscsi-multipath/pre.yaml
@@ -109,3 +109,108 @@
ip_node_2_iscsi0: {{ ip_node_2_iscsi0 }}
ip_node_2_iscsi1: {{ ip_node_2_iscsi1 }}
dest: "~/ansivars.yaml"
+
+
+- hosts: lab-sp-a1
+ vars_files:
+ - vars.yaml
+ tasks:
+ - set_fact:
+ sp_iscsi0_mac: "{{ hostvars['undercloud-client']['port_node_1_iscsi0_mac'] }}"
+ sp_iscsi1_mac: "{{ hostvars['undercloud-client']['port_node_1_iscsi1_mac'] }}"
+ ip_node_1_iscsi0: "{{ hostvars['undercloud-client']['ip_node_1_iscsi0'] }}/24"
+ ip_node_1_iscsi1: "{{ hostvars['undercloud-client']['ip_node_1_iscsi1'] }}/24"
+
+ - set_fact:
+ storpool_netplan: "{{ hostvars['localhost'].STORPOOL_ISCSI_NETPLAN.v }}"
+ no_log: true
+
+ - name: Provision the Netplan Template
+ no_log: true
+ become: true
+ ansible.builtin.copy:
+ content: "{{ storpool_netplan }}"
+ dest: /etc/netplan/60-storpool-iscsi.network
+
+ - name: Generate Netplan
+ become: true
+ ansible.builtin.command:
+ argv: ["netplan", "generate"]
+
+ - name: Restart Netplan
+ become: true
+ ansible.builtin.command:
+ argv: ["netplan", "apply"]
+
+ - name: Create Service to Apply Interface Configuration on Boot
+ no_log: true
+ become: true
+ ansible.builtin.copy:
+ content: "{{ hostvars['localhost'].STORPOOL_NETPLAN_SERVICE.v }}"
+ dest: /etc/systemd/system/netplan-fix.service
+
+ - name: Enable Service to Apply Interface Configuration on Boot
+ no_log: true
+ become: true
+ ansible.builtin.command:
+ argv: [ "systemctl", "enable", "netplan-fix" ]
+
+ - name: Provision StorPool Deployment Configuration
+ no_log: true
+ ansible.builtin.lineinfile:
+ path: /home/ubuntu/.ssh/authorized_keys
+ line: "{{ STORPOOL_DEPLOY_KEY_PUB['v'] }}"
+ insertafter: EOF
+
+- hosts: controller
+ vars_files:
+ - vars.yaml
+ tasks:
+ - set_fact:
+ iscsi_mac: "{{ hostvars['undercloud-client']['port_node_2_iscsi0_mac'] }}"
+ iscsi_ip: "{{ hostvars['undercloud-client']['ip_node_2_iscsi0'] }}/24"
+
+ - set_fact:
+ systemd_networkd_iscsi: "{{ hostvars['localhost'].ISCSI_NODE_SYSTEMD_NETWORKD.v }}"
+ no_log: true
+
+ - name: Provision the Netplan Template for iSCSI Network 1
+ no_log: true
+ become: true
+ ansible.builtin.copy:
+ content: "{{ systemd_networkd_iscsi }}"
+ dest: /etc/systemd/network/60-storpool-iscsi-1.network
+
+ - set_fact:
+ iscsi_mac: "{{ hostvars['undercloud-client']['port_node_2_iscsi1_mac'] }}"
+ iscsi_ip: "{{ hostvars['undercloud-client']['ip_node_2_iscsi1'] }}/24"
+
+ - set_fact:
+ systemd_networkd_iscsi: "{{ hostvars['localhost'].ISCSI_NODE_SYSTEMD_NETWORKD.v }}"
+ no_log: true
+
+ - name: Provision the Netplan Template for iSCSI Network 2
+ no_log: true
+ become: true
+ ansible.builtin.copy:
+ content: "{{ systemd_networkd_iscsi }}"
+ dest: /etc/systemd/network/61-storpool-iscsi-2.network
+
+ - name: Restart systemd-networkd to Apply the Network Configuration
+ become: true
+ ansible.builtin.command:
+ argv: [ "systemctl", "restart", "systemd-networkd" ]
+
+ - name: Set multipath.conf user_friendly_names to no
+ become: true
+ ansible.builtin.copy:
+ content: "defaults {\n user_friendly_names no\n getuid_callout \"/lib/udev/scsi_id --whitelisted --device=/dev/%n\"\n}\n"
+ dest: "/etc/multipath.conf"
+ owner: root
+ group: root
+ mode: '0644'
+
+ - name: Restart multipathd
+ become: true
+ ansible.builtin.command:
+ argv: [ "systemctl", "restart", "multipathd" ]
\ No newline at end of file
diff --git a/zuul.d/sp-cinder-secrets.yaml b/zuul.d/sp-cinder-secrets.yaml
index d65eef6..c2b5657 100644
--- a/zuul.d/sp-cinder-secrets.yaml
+++ b/zuul.d/sp-cinder-secrets.yaml
@@ -274,29 +274,34 @@
ezh4Vg80J6HD+RItyqiD4vRGNlfnJER+r1KES2zKWjqc8L5BPycquABBjuQC8Y=
- secret:
- name: STORPOOL_NETPLAN
+ name: STORPOOL_ISCSI_NETPLAN
data:
v: !encrypted/pkcs1-oaep
- - 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
+ - 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
+
+- secret:
+ name: STORPOOL_STORPOOL_NETPLAN
+ data:
+ v: !encrypted/pkcs1-oaep
+ - oFfCoh8lJjxrOqbLI2lUnEOc2GXDmeCx/FkaBRa4f+v4mjZ7ZzWeGya9B+AXC+lxOMN90
+ BAyA4w3OU+BzAEhvPmA8/GwuX/prME6pOC/PKe2GVKRv7Q6FX47z8sUVA8zv1aQXKlXxO
+ vsIxT7jFGzWqdGcNTPQVv4ZPtEzBtoSlPhR2ODY6fIxsfQSvSelJSzFdusJGOMAtMbaPS
+ CN5wMTugZDjXYO7xwBt1lTZ4py7gof6qD1jbDGtiLG+M6FWAOsvxoFD+npd20tHnWWNS5
+ VBelIj7mRS8oYtpBdTRZLZXiE+iLTriH/cmJXL/8qdL3JCjTnrSu5Yx5wl37xJ+DcWb3P
+ dlsYc4mQz8KP/89cDjRWUU2Z/xP7gRB3vteaxFpo0LkgDyTWtF9AuTeCoZJkQqw3auMWi
+ zKJo9t3ahFaT3cEgPsCCwd5GHIcDowpJ8z3rNeOhYB2mkryRemKvU7WnJ8oQC4HafTdNG
+ ef4+B9TUFsvoBWScxg5l/af53Fa33sK0k0PoWqXuwT2/MAtPglEoOpUqFzcSQ8zSsLIp7
+ BSDFGh2K/+s+29+zgf4PlSF+KaZZ7E7wMB/KQhmd6D4LYMeu03eHO+OTMSAzaR0z6AtJ9
+ sn+A/YIhI3tNEsWBOumBlIg90oi9ZTCamlyvTOIiST67tPQqwxZjlXz5y+/FEQ=
- secret:
name: STORPOOL_NETPLAN_SERVICE
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 5e7872b..2ec5e5d 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -147,8 +147,10 @@
secret: STORPOOL_DEPLOY_KEY_PUB
- name: STORPOOL_INVENTORY
secret: STORPOOL_INVENTORY
- - name: STORPOOL_NETPLAN
- secret: STORPOOL_NETPLAN
+ - name: STORPOOL_ISCSI_NETPLAN
+ secret: STORPOOL_ISCSI_NETPLAN
+ - name: STORPOOL_STORPOOL_NETPLAN
+ secret: STORPOOL_STORPOOL_NETPLAN
- name: STORPOOL_NETPLAN_SERVICE
secret: STORPOOL_NETPLAN_SERVICE
- name: STORPOOL_CONF
@@ -256,8 +258,10 @@
secret: STORPOOL_DEPLOY_KEY_PUB
- name: STORPOOL_INVENTORY
secret: STORPOOL_INVENTORY
- - name: STORPOOL_NETPLAN
- secret: STORPOOL_NETPLAN
+ - name: STORPOOL_ISCSI_NETPLAN
+ secret: STORPOOL_ISCSI_NETPLAN
+ - name: STORPOOL_STORPOOL_NETPLAN
+ secret: STORPOOL_STORPOOL_NETPLAN
- name: STORPOOL_NETPLAN_SERVICE
secret: STORPOOL_NETPLAN_SERVICE
- name: STORPOOL_CONF
@@ -283,8 +287,10 @@
branches: master
# - cinder-storpool-tempest-iscsi-multipath:
# branches: master
-# experimental:
-# jobs:
+ experimental:
+ jobs:
+ - cinder-storpool-tempest-iscsi-multipath:
+ branches: master
# #- cinder-storpool-tempest-experimental:
# # branches: master
# #- cinder-storpool-tempest-iscsi: