Skip to content

Commit f82156d

Browse files
committed
Ensure removing image_build infra completes
1 parent 1853e7a commit f82156d

File tree

4 files changed

+25
-40
lines changed

4 files changed

+25
-40
lines changed

image-build.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
- name: Build image
3+
hosts: openstack
4+
tasks:
5+
- name: Manage image build infra
6+
include_role:
7+
name: image_build_infra
8+
when:
9+
- image_build_manage_infra is defined
10+
- image_build_manage_infra
11+
12+
- block:
13+
- name: Build fat image
14+
include_role:
15+
name: image_build
16+
17+
- name: Set cluster_image fact
18+
set_fact:
19+
cluster_image: "{{ image_build_data.artifact_id }}"
20+
21+
- name: Print cluster_image UUID
22+
debug:
23+
msg: "{{ cluster_image }}"
24+
when: cluster_state is not defined or (cluster_state is defined and cluster_state != "absent")

image-build/image-build.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

roles/image_build_infra/tasks/destroy.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

roles/image_build_infra/tasks/create.yml renamed to roles/image_build_infra/tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@
4444
image_build_ssh_private_key_file: "{{ cluster_ssh_private_key_file }}"
4545
image_build_source_image_id: "{{ terraform_provision.outputs.source_image_name.value.ids | first }}"
4646
image_build_security_group_id: "{{ terraform_provision.outputs.security_group_id.value }}"
47+
when: cluster_state is not defined or (cluster_state is defined and cluster_state != "absent")
4748

0 commit comments

Comments
 (0)