Skip to content
Merged
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
20 changes: 10 additions & 10 deletions components/images-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ images:

tags:
# these are common across all these OpenStack Helm installations
bootstrap: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
db_init: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
db_drop: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ks_user: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ks_service: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ks_endpoints: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
bootstrap: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
db_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
db_drop: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
ks_user: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
ks_service: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
ks_endpoints: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"

# keystone
keystone_api: "ghcr.io/rackerlabs/understack/keystone:2024.2-ubuntu_jammy"
Expand All @@ -29,9 +29,9 @@ images:
ironic_pxe_http: "docker.io/nginx:1.13.3"
ironic_db_sync: "ghcr.io/rackerlabs/understack/ironic:2024.2-ubuntu_jammy"
# these want curl which apparently is in the heat image
ironic_manage_cleaning_network: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ironic_retrive_cleaning_network: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ironic_retrive_swift_config: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
ironic_manage_cleaning_network: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
ironic_retrive_cleaning_network: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
ironic_retrive_swift_config: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"

# neutron
neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2024.2-ubuntu_jammy"
Expand All @@ -50,7 +50,7 @@ images:
# nova
nova_api: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
nova_cell_setup: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
nova_cell_setup_init: "docker.io/openstackhelm/heat:2024.2-ubuntu_jammy"
nova_cell_setup_init: "quay.io/airshipit/heat:2024.2-ubuntu_jammy"
nova_compute: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
nova_compute_ironic: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
nova_compute_ssh: "ghcr.io/rackerlabs/understack/nova:2024.2-ubuntu_jammy"
Expand Down
2 changes: 1 addition & 1 deletion components/ironic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ conductor:
# it is only necessary because the above pxe is disabled, its init
# creates this path
- name: create-tftpboot
image: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
image: quay.io/airshipit/heat:2024.2-ubuntu_jammy
imagePullPolicy: IfNotPresent
command: [bash]
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
restartPolicy: Always
containers:
- name: "image-ks-service-registration"
image: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
image: quay.io/airshipit/heat:2024.1-ubuntu_jammy
imagePullPolicy: IfNotPresent
command:
- sleep
Expand Down
9 changes: 2 additions & 7 deletions containers/ironic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/ironic:${OPENSTACK_VERSION}-ubuntu_jammy AS builder
FROM quay.io/airshipit/ironic:${OPENSTACK_VERSION}-ubuntu_jammy AS builder

COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

Expand All @@ -13,14 +13,12 @@ RUN --mount=type=cache,target=/root/.cache/uv \
cd $(dirname ${proj}) && uv build --wheel --out-dir /tmp/wheels/; \
done

FROM docker.io/openstackhelm/ironic:${OPENSTACK_VERSION}-ubuntu_jammy AS final
FROM quay.io/airshipit/ironic:${OPENSTACK_VERSION}-ubuntu_jammy AS final

RUN apt-get update && \
apt-get install -y --no-install-recommends \
genisoimage \
isolinux \
patch \
quilt \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN --mount=type=cache,target=/root/.cache/pip \
Expand All @@ -29,6 +27,3 @@ RUN --mount=type=cache,target=/root/.cache/pip \
ironic-understack \
understack-flavor-matcher \
sushy-oem-idrac==6.0.0
COPY containers/ironic/patches /tmp/patches/
RUN cd /var/lib/openstack/lib/python3.10/site-packages && \
QUILT_PATCHES=/tmp/patches quilt push -a
82 changes: 0 additions & 82 deletions containers/ironic/patches/0001_use_update_pxe_enabled_conf.patch

This file was deleted.

1 change: 0 additions & 1 deletion containers/ironic/patches/series

This file was deleted.

2 changes: 1 addition & 1 deletion containers/keystone/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/keystone:${OPENSTACK_VERSION}-ubuntu_jammy
FROM quay.io/airshipit/keystone:${OPENSTACK_VERSION}-ubuntu_jammy

ADD --checksum=sha256:deb52ea8304a41ee0331e4ba87a9f82ff643464b6d34084e161f58ec11c25a69 https://github.com/OpenIDC/mod_auth_openidc/releases/download/v2.4.16.5/libapache2-mod-auth-openidc_2.4.16.5-1.jammy_amd64.deb /tmp

Expand Down
4 changes: 2 additions & 2 deletions containers/neutron/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/neutron:${OPENSTACK_VERSION}-ubuntu_jammy AS builder
FROM quay.io/airshipit/neutron:${OPENSTACK_VERSION}-ubuntu_jammy AS builder

COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

Expand All @@ -11,7 +11,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
cd /tmp/neutron-understack && \
uv build --wheel --out-dir /tmp/wheels/

FROM docker.io/openstackhelm/neutron:${OPENSTACK_VERSION}-ubuntu_jammy AS final
FROM quay.io/airshipit/neutron:${OPENSTACK_VERSION}-ubuntu_jammy AS final

RUN --mount=type=cache,target=/root/.cache/pip \
--mount=from=builder,source=/tmp/wheels,target=/tmp/wheels \
Expand Down
2 changes: 1 addition & 1 deletion containers/nova/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/nova:${OPENSTACK_VERSION}-ubuntu_jammy
FROM quay.io/airshipit/nova:${OPENSTACK_VERSION}-ubuntu_jammy

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion containers/openstack-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1

ARG OPENSTACK_VERSION="required_argument"
FROM docker.io/openstackhelm/openstack-client:${OPENSTACK_VERSION}
FROM quay.io/airshipit/openstack-client:${OPENSTACK_VERSION}
2 changes: 1 addition & 1 deletion go/understackctl/cmd/helmConfig/helmConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func ironic() error {
conductor:
initContainers:
- name: create-tmpdir
image: docker.io/openstackhelm/heat:2024.2-ubuntu_jammy
image: quay.io/airshipit/heat:2024.2-ubuntu_jammy
imagePullPolicy: IfNotPresent
command: [bash]
args:
Expand Down
Loading