From c652c4babcf22b4d3a0453ba8c56130e12e767c6 Mon Sep 17 00:00:00 2001 From: Sreejith Punnapuzha Date: Wed, 17 Mar 2021 13:46:02 -0500 Subject: [PATCH] Align ironic with metal3 ironic metal3 is using ironic victoria verion. so uplifting ironic ussuri to victoria Signed-off-by: Sreejith Punnapuzha Change-Id: If26e127fe06807c6f11c27a7d4d6d082e929b030 --- ironic/Makefile | 2 +- ironic/build-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ironic/Makefile b/ironic/Makefile index 2b890af..e282044 100644 --- a/ironic/Makefile +++ b/ironic/Makefile @@ -20,7 +20,7 @@ COMMIT ?= $(shell git rev-parse HEAD) LABEL ?= org.airshipit.build=community DOCKER_REGISTRY ?= quay.io IMAGE_PREFIX ?= airshipit -OPENSTACK_VERSION ?= stable/ussuri +OPENSTACK_VERSION ?= stable/victoria DISTRO ?= ubuntu_bionic OS_VER = $(word 2, $(subst /, ,$(OPENSTACK_VERSION))) IMAGE_NAME ?= ironic diff --git a/ironic/build-image.sh b/ironic/build-image.sh index 64be9e9..3d2f1d2 100755 --- a/ironic/build-image.sh +++ b/ironic/build-image.sh @@ -10,7 +10,7 @@ set -e # dockerhub user. Example: "docker.io/openstackhelm" : "${REGISTRY_URI:="quay.io/airshipit"}" # The openstack branch to build, if no per project branch is given. -: "${OPENSTACK_VERSION:=stable/ussuri}" +: "${OPENSTACK_VERSION:=stable/victoria}" # Sepcify OS distribution : "${DISTRO:="ubuntu_bionic"}" # extra build arguments for the base image. See loci's dockerfiles for