Skip to content

Add Barbican HSM custom image support #1087

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Barbican HSM custom image support #1087

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ BARBICAN_DEPL_IMG ?= unused
BARBICAN_KUTTL_CONF ?= ${OPERATOR_BASE_DIR}/barbican-operator/kuttl-test.yaml
BARBICAN_KUTTL_DIR ?= ${OPERATOR_BASE_DIR}/barbican-operator/tests/kuttl/tests
BARBICAN_KUTTL_NAMESPACE ?= barbican-kuttl-tests
# HSM-enabled Barbican image overrides
BARBICAN_API_IMAGE ?=
BARBICAN_WORKER_IMAGE ?=
BARBICAN_HSM_ENABLED ?= false

# Mariadb
MARIADB_IMG ?= quay.io/openstack-k8s-operators/mariadb-operator-index:${OPENSTACK_K8S_TAG}
Expand Down Expand Up @@ -583,6 +587,15 @@ ${1}: export OPERATOR_SOURCE=$(OPERATOR_SOURCE)
${1}: export OPERATOR_SOURCE_NAMESPACE=$(OPERATOR_SOURCE_NAMESPACE)
endef

ifeq ($(BARBICAN_HSM_ENABLED),true)
ifneq ($(BARBICAN_API_IMAGE),)
BARBICAN_API_IMG := $(BARBICAN_API_IMAGE)
endif
ifneq ($(BARBICAN_WORKER_IMAGE),)
BARBICAN_WORKER_IMG := $(BARBICAN_WORKER_IMAGE)
endif
endif

.PHONY: all
all: operator_namespace keystone mariadb placement neutron

Expand Down Expand Up @@ -771,6 +784,9 @@ openstack_wait: ## waits openstack CSV to succeed.

# creates the new initialization resource for our operators
.PHONY: openstack_init
openstack_init: export BARBICAN_API_IMAGE:=$(BARBICAN_API_IMAGE)
openstack_init: export BARBICAN_WORKER_IMAGE:=$(BARBICAN_WORKER_IMAGE)
openstack_init: export BARBICAN_HSM_ENABLED:=$(BARBICAN_HSM_ENABLED)
openstack_init: openstack_wait
bash -c 'test -f ${OPERATOR_BASE_DIR}/openstack-operator/config/samples/operator_v1beta1_openstack.yaml || make openstack_repo'
oc apply -f ${OPERATOR_BASE_DIR}/openstack-operator/config/samples/operator_v1beta1_openstack.yaml
Expand Down Expand Up @@ -1250,6 +1266,8 @@ barbican_cleanup: ## deletes the operator, but does not cleanup the service reso

.PHONY: barbican_deploy_prep
barbican_deploy_prep: export KIND=Barbican
barbican_deploy_prep: export IMAGE=${BARBICAN_API_IMG:-unused},${BARBICAN_WORKER_IMG:-unused}
barbican_deploy_prep: export IMAGE_PATH=barbicanAPI/containerImage,barbicanWorker/containerImage
barbican_deploy_prep: export REPO=${BARBICAN_REPO}
barbican_deploy_prep: export BRANCH=${BARBICAN_BRANCH}
barbican_deploy_prep: export HASH=${BARBICAN_COMMIT_HASH}
Expand Down
6 changes: 5 additions & 1 deletion devsetup/standalone/openstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ EOF
fi
if [ "$BARBICAN_ENABLED" = "true" ]; then
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/barbican.yaml"
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml"
if [ "$BARBICAN_HSM_ENABLED" = "true" ]; then
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-pkcs11.yaml"
else
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml"
fi
fi
if [ "$MANILA_ENABLED" = "true" ]; then
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/manila-cephfsnative-config.yaml"
Expand Down