From 1bb5e80ae4be54837cdca84f6bfbe180a79f37b2 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 28 Apr 2020 18:18:14 -0700 Subject: [PATCH] Add ironic-python-agent-builder to grenade projects and use netboot It appears that grenade now requires ironic-python-agent-builder to be in the projects list in order for clone operations to take place. Also switch to netboot as the default boot option is local now. Change-Id: Ibf66351137d9f4221c9c191b4d9a4b2272f0f516 --- .../legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 1 + playbooks/legacy/grenade-dsvm-ironic/run.yaml | 3 +++ zuul.d/legacy-ironic-jobs.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index faea30335d..a29fa530e3 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -118,6 +118,7 @@ export PROJECTS="openstack/ironic $PROJECTS" export PROJECTS="openstack/ironic-lib $PROJECTS" export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/ironic-python-agent-builder $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml index bf38ff9cd2..080287a121 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -64,6 +64,7 @@ export PROJECTS="openstack/ironic $PROJECTS" export PROJECTS="openstack/ironic-lib $PROJECTS" export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/ironic-python-agent-builder $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" @@ -99,6 +100,8 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_REQUIRE_AGENT_TOKEN=False" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_BOOT_OPTION=netboot" + # Ensure the ironic-vars-EARLY file exists touch ironic-vars-early # Pull in the EARLY variables injected by the optional builders diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index 540d0dddb7..1ae8342b46 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -19,6 +19,7 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent + - openstack/ironic-python-agent-builder - openstack/ironic-tempest-plugin - openstack/python-ironicclient - openstack/virtualbmc