Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion 03_launch_mgmt_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ function update_images(){
#
function launch_ironic() {
pushd "${BMOPATH}"

# Only enabling the inspector reverse proxy if and only if the ironic TLS is enabled
INSPECTOR_REVERSE_PROXY_SETUP="$IRONIC_TLS_SETUP"
# Update Configmap parameters with correct urls
cp "${BMOPATH}/ironic-deployment/keepalived/ironic_bmo_configmap.env" "${BMOPATH}/ironic-deployment/keepalived/ironic_bmo_configmap.env.orig"
cat << EOF | sudo tee "$IRONIC_DATA_DIR/ironic_bmo_configmap.env"
Expand All @@ -193,6 +194,7 @@ IRONIC_ENDPOINT=${IRONIC_URL}
IRONIC_INSPECTOR_ENDPOINT=${IRONIC_INSPECTOR_URL}
CACHEURL=http://${PROVISIONING_URL_HOST}/images
IRONIC_FAST_TRACK=true
INSPECTOR_REVERSE_PROXY_SETUP=${INSPECTOR_REVERSE_PROXY_SETUP}
EOF

if [ "$NODES_PLATFORM" == "libvirt" ] ; then
Expand Down
1 change: 1 addition & 0 deletions 04_verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ EXPTD_V1ALPHA4_RS="cluster.x-k8s.io/provider:infrastructure-metal3:capm3-system:
cluster.x-k8s.io/provider:control-plane-kubeadm:capi-webhook-system:1"
BRIDGES="provisioning baremetal"
EXPTD_CONTAINERS="httpd-infra registry vbmc sushy-tools"
[[ $IRONIC_TLS_SETUP == "true" ]] && EXPTD_CONTAINERS="${EXPTD_CONTAINERS} httpd-reverse-proxy"

FAILS=0
BMO_RUN_LOCAL="${BMO_RUN_LOCAL:-false}"
Expand Down
2 changes: 1 addition & 1 deletion lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ function init_minikube() {
#
function remove_ironic_containers() {
#shellcheck disable=SC2015
for name in ipa-downloader vbmc sushy-tools httpd-infra; do
for name in ipa-downloader vbmc sushy-tools httpd-infra httpd-reverse-proxy; do
sudo "${CONTAINER_RUNTIME}" ps | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" kill $name || true
sudo "${CONTAINER_RUNTIME}" ps --all | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" rm $name -f || true
done
Expand Down
1 change: 1 addition & 0 deletions vm-setup/roles/v1aX_integration_test/tasks/move.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- ironic-inspector
- dnsmasq
- httpd
- httpd-reverse-proxy
- mariadb
- ironic-endpoint-keepalived
- ironic-log-watch
Expand Down