Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CB-26823: Use RHEL 8.10 for FreeIPA images #1040

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CB-26823: Use RHEL 8.10 for FreeIPA images #1040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,14 @@ $(error "AZURE_IMAGE_VHD and Marketplace image properties (AZURE_IMAGE_PUBLISHER
AZURE_IMAGE_OFFER ?= rhel-byos
ifeq ($(STACK_VERSION),7.3.1)
# CB-26812: Temp rollback!
# AZURE_IMAGE_SKU ?= rhel-lvm10
# AZURE_IMAGE_SKU ?= rhel-lvm810
AZURE_IMAGE_SKU ?= rhel-lvm88
else
AZURE_IMAGE_SKU ?= rhel-lvm88
ifeq ($(CUSTOM_IMAGE_TYPE),freeipa)
AZURE_IMAGE_SKU ?= rhel-lvm810
else
AZURE_IMAGE_SKU ?= rhel-lvm88
endif
endif
else ifeq ($(OS),centos7)
AZURE_IMAGE_PUBLISHER ?= OpenLogic
Expand Down Expand Up @@ -78,7 +82,11 @@ ifeq ($(CLOUD_PROVIDER),AWS)
# AWS_SOURCE_AMI ?= ami-02073841a355a1e92
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
else
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
ifeq ($(CUSTOM_IMAGE_TYPE),freeipa)
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
else
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
endif
endif
AWS_INSTANCE_TYPE ?= t3.2xlarge
endif
Expand Down Expand Up @@ -107,7 +115,11 @@ ifeq ($(CLOUD_PROVIDER),GCP)
# GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
else
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
ifeq ($(CUSTOM_IMAGE_TYPE),freeipa)
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
else
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
endif
endif
endif
endif
Expand Down