sp-init: Make the storprep invocation optional
Some setups do not require storprep
Change-Id: Idbbdd2a54c0ea037faf7aa3f86b5f7e223efc432
diff --git a/playbooks/sp-init.yaml b/playbooks/sp-init.yaml
index 2862b1b..736d155 100644
--- a/playbooks/sp-init.yaml
+++ b/playbooks/sp-init.yaml
@@ -4,49 +4,53 @@
host_id: "{{ hostvars['controller']['nodepool']['external_id'] }}"
storprep_filename: "/tmp/storprep-bootstrap-{{ host_id }}.sh"
tasks:
- - name: ctrl-sp-whoami-hostname
- shell:
- cmd: hostname || true
-
- - name: ctrl-sp-fetch-storprep
- shell:
- cmd: curl -C - -o '{{ storprep_filename }}' -- https://spfactory.storpool.com/sp-osci/storprep-bootstrap-sh.txt
-
- name: storprep
+ when: do_storprep is defined and do_storprep
block:
- - name: Create a Temporary Directory
- ansible.builtin.tempfile:
- state: directory
- prefix: storprep-bootstrap.
- register: tmpdir
-
- - name: Provision OpenStack Data
- no_log: true
- ansible.builtin.copy:
- content: "{{ OPENSTACK_DATA['v'] }}"
- dest: "{{ tmpdir.path }}/clouds.yaml"
- mode: '0600'
-
- - name: ctrl-sp-run-storprep
+ - name: ctrl-sp-whoami-hostname
shell:
- cmd: sh '{{ storprep_filename }}' -d '{{ tmpdir.path }}' -- -n lab-charmed-testing-storage -s lab-vlan400 -- {{ host_id }}
+ cmd: hostname || true
- always:
+ - name: ctrl-sp-fetch-storprep
+ shell:
+ cmd: curl -C - -o '{{ storprep_filename }}' -- https://spfactory.storpool.com/sp-osci/storprep-bootstrap-sh.txt
- - name: Remove the Temporary Directory
- ansible.builtin.file:
- path: "{{ tmpdir.path }}"
- state: absent
- when: tmpdir.path is defined
+ - name: run_storprep
+ block:
- - name: ctrl-sp-rm-storprep
- shell:
- cmd: rm -- '{{ storprep_filename }}'
+ - name: Create a Temporary Directory
+ ansible.builtin.tempfile:
+ state: directory
+ prefix: storprep-bootstrap.
+ register: tmpdir
- - name: ctrl-sp-processes
- shell:
- cmd: ps awwfux
+ - name: Provision OpenStack Data
+ no_log: true
+ ansible.builtin.copy:
+ content: "{{ OPENSTACK_DATA['v'] }}"
+ dest: "{{ tmpdir.path }}/clouds.yaml"
+ mode: '0600'
+
+ - name: ctrl-sp-run-storprep
+ shell:
+ cmd: sh '{{ storprep_filename }}' -d '{{ tmpdir.path }}' -- -n lab-charmed-testing-storage -s lab-vlan400 -- {{ host_id }}
+
+ always:
+
+ - name: Remove the Temporary Directory
+ ansible.builtin.file:
+ path: "{{ tmpdir.path }}"
+ state: absent
+ when: tmpdir.path is defined
+
+ - name: ctrl-sp-rm-storprep
+ shell:
+ cmd: rm -- '{{ storprep_filename }}'
+
+ - name: ctrl-sp-processes
+ shell:
+ cmd: ps awwfux
- hosts: tempest
tasks:
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index e59d7ff..bfffadc 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -16,6 +16,7 @@
- name: OPENSTACK_DATA
secret: OPENSTACK_DATA
vars:
+ do_storprep: true
devstack_localrc:
CINDER_ENABLED_BACKENDS: storpool:storpool
# CINDER_ISCSI_HELPER: tgtadm
@@ -54,6 +55,7 @@
parent: cinder-storpool-tempest
vars:
sp_experimental: true
+ do_storprep: true
devstack_localrc:
# cfg: iscsi
TEMPEST_STORAGE_PROTOCOL: iscsi