From 44b140cedcdf734806652b8c12e35530de07ab8d Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 5 Sep 2018 14:14:30 +0100
Subject: [PATCH] Use force rebuild feature in stackhpc.os-images role
Change-Id: I21a682c72cee97583dcb4f1a01fa023c6e885608
---
ansible/overcloud-ipa-build.yml | 7 +------
ansible/seed-ipa-build.yml | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/ansible/overcloud-ipa-build.yml b/ansible/overcloud-ipa-build.yml
index 8dd2855f..53f2da7e 100644
--- a/ansible/overcloud-ipa-build.yml
+++ b/ansible/overcloud-ipa-build.yml
@@ -23,12 +23,6 @@
ipa_image_force_rebuild: false
tasks:
- block:
- - name: Ensure existing Ironic Python Agent images are removed (force rebuild)
- file:
- path: "{{ image_cache_path }}/{{ ipa_image_name }}"
- state: absent
- when: ipa_image_force_rebuild | bool
-
- name: Ensure Ironic Python Agent images are built
include_role:
name: stackhpc.os-images
@@ -44,4 +38,5 @@
type: raw
os_images_git_elements: "{{ ipa_build_dib_git_elements }}"
os_images_upload: False
+ os_images_force_rebuild: "{{ ipa_image_force_rebuild }}"
when: ipa_build_images | bool
diff --git a/ansible/seed-ipa-build.yml b/ansible/seed-ipa-build.yml
index bddacab5..69e53b6d 100644
--- a/ansible/seed-ipa-build.yml
+++ b/ansible/seed-ipa-build.yml
@@ -14,12 +14,6 @@
ipa_image_force_rebuild: false
tasks:
- block:
- - name: Ensure existing Ironic Python Agent images are removed (force rebuild)
- file:
- path: "{{ image_cache_path }}/{{ ipa_image_name }}"
- state: absent
- when: ipa_image_force_rebuild | bool
-
- name: Ensure Ironic Python Agent images are built
include_role:
name: stackhpc.os-images
@@ -35,6 +29,7 @@
type: raw
os_images_git_elements: "{{ ipa_build_dib_git_elements }}"
os_images_upload: False
+ os_images_force_rebuild: "{{ ipa_image_force_rebuild }}"
- name: Ensure Ironic Python Agent images are copied onto seed
copy:
--
GitLab