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
2 changes: 1 addition & 1 deletion .github/workflows/containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
with:
context: "{{defaultContext}}:containers/dnsmasq"
file: Dockerfile
push: ${{ github.event_name != 'pull_request' }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

Expand Down
6 changes: 0 additions & 6 deletions components/ironic/dnsmasq-ss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ spec:
mountPath: /etc/dnsmasq.d
- name: pod-dhcp
mountPath: /var/lib/misc
- name: understack-data
mountPath: /var/lib/understack/
readOnly: true
volumes:
- name: pod-tmp
emptyDir: {}
Expand All @@ -90,6 +87,3 @@ spec:
- name: pod-dhcp
persistentVolumeClaim:
claimName: dnsmasq-dhcp
- name: understack-data
persistentVolumeClaim:
claimName: understack-data
1 change: 0 additions & 1 deletion components/ironic/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
- ironic-rabbitmq-queue.yaml
- dnsmasq-pvc.yaml
- dnsmasq-ss.yaml
- understack-data-pvc.yaml
- ironic-ks-user-baremetal.yaml
# less than ideal addition but necessary so that we can have the ironic.conf.d loading
# working due to the way the chart hardcodes the config-file parameter which then
Expand Down
11 changes: 0 additions & 11 deletions components/ironic/understack-data-pvc.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions components/ironic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ pod:
mountPath: /etc/dnsmasq.d/
- name: dnsmasq-dhcp
mountPath: /var/lib/dnsmasq/
- name: understack-data
mountPath: /var/lib/understack
- name: device-types
mountPath: /var/lib/understack/device-types
- name: ironic-etc-snippets
Expand All @@ -229,9 +227,6 @@ pod:
- name: dnsmasq-dhcp
persistentVolumeClaim:
claimName: dnsmasq-dhcp
- name: understack-data
persistentVolumeClaim:
claimName: understack-data
- name: device-types
configMap:
name: device-types
Expand Down
6 changes: 5 additions & 1 deletion containers/dnsmasq/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN apt-get update && apt-get -y install \
pkg-config \
ca-certificates \
quilt \
ipxe \
--no-install-recommends
WORKDIR /src
RUN apt-get -y build-dep dnsmasq
Expand All @@ -42,11 +43,14 @@ COPY --from=builder /src/dnsmasq-base_*_amd64.deb /tmp
COPY --from=builder /src/dnsmasq_*_all.deb /tmp

RUN apt-get update && \
apt-get -y install --no-install-recommends python3-jinja2 && \
apt-get -y install --no-install-recommends python3-jinja2 ipxe && \
apt-get -y --fix-broken install --no-install-recommends /tmp/dnsmasq-base_*_amd64.deb /tmp/dnsmasq_*_all.deb && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/*.deb

RUN mkdir -p /var/lib/openstack-helm/tftpboot && \
cp /usr/lib/ipxe/snponly.efi /var/lib/openstack-helm/tftpboot/

COPY common/helpers.sh /helpers.sh
COPY dnsmasq/entry-point.sh /entry-point.sh
RUN chmod +x /entry-point.sh
Expand Down
Loading