Add logically bound images for EDPM services #39
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,34 +4,57 @@ RUN rm -rf /etc/yum.repos.d/*.repo | |
| COPY output/yum.repos.d /etc/yum.repos.d | ||
|
|
||
| ARG PACKAGES="\ | ||
| bind-utils \ | ||
| buildah \ | ||
| cephadm \ | ||
| chrony \ | ||
| cloud-init \ | ||
| crudini \ | ||
| cronie \ | ||
| crypto-policies-scripts \ | ||
| device-mapper-multipath \ | ||
| driverctl \ | ||
| grubby \ | ||
| grub2-tools \ | ||
| iproute-tc \ | ||
| iptables-services \ | ||
| iscsi-initiator-utils \ | ||
| jq \ | ||
| libvirt \ | ||
| libvirt-daemon-driver-qemu \ | ||
| lvm2 \ | ||
| NetworkManager-ovs \ | ||
| nftables \ | ||
| numactl \ | ||
| openssh-server \ | ||
| openstack-selinux \ | ||
| openvswitch \ | ||
| os-net-config \ | ||
| podman \ | ||
| python3-libselinux \ | ||
| python3-pyroute2 \ | ||
| python3-pyyaml \ | ||
| rsync \ | ||
| sysstat \ | ||
| tmpwatch \ | ||
| tuned-profiles-cpu-partitioning \ | ||
| qemu-kvm" | ||
|
|
||
| ARG ENABLE_UNITS="openvswitch" | ||
|
|
||
| RUN sudo dnf install centos-release-nfv-openvswitch centos-release-openstack-dalmatian -y && dnf -y install $PACKAGES && dnf clean all && systemctl enable $ENABLE_UNITS | ||
|
There was a problem hiding this comment. where are you getting the rpms centos-release-nfv-openvswitch centos-release-openstack-dalmatian from? you must be customizing the repo-setup command for the build somehow? those are available on the base quay.io/centos-bootc/centos-bootc:stream9 image, but since our first command is RUN rm -rf /etc/yum.repos.d/*.repo, the enabled repos get removed, and then those packages are no longer available |
||
|
|
||
| # Template systemd service for services | ||
| COPY embedded-services/quadlets/systemd/service-template.kube /usr/share/containers/systemd/[email protected] | ||
|
|
||
| ## Service specific quadlets | ||
| COPY embedded-services/quadlets/*/* /usr/share/containers/systemd/ | ||
|
|
||
| # Pre-cache containers for each service | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-iscsid:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-cron:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-multipathd:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified | ||
| RUN podman pull quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified | ||
|
There was a problem hiding this comment. Do we want each pull in its own layer? I don't know?? If we didn't then this could be reduced to a single RUN There was a problem hiding this comment. This actually isn't working anymore. Complains about things not being available in the container environment. I'm actually noticing the same error with my laptop bootc image too. Maybe something changed in the base edpm centos image. For now, I'm just commenting these lines when I build the image and letting There was a problem hiding this comment. these commands give me a lot of There was a problem hiding this comment. I believe using AIUI, a difference between logically and physically images for bootc is that logically bound images are only referenced. And in order to reference them, the |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [install] | ||
| WantedBy=edpm-compute@ceilometer_agent_compute.service | ||
|
|
||
| [Image] | ||
| Image=quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| annotations: | ||
| bind-mount-options: /var/lib/openstack/cacerts/telemetry/tls-ca-bundle.pem:z | ||
| labels: | ||
| app: ceilometeragentcompute | ||
| name: ceilometeragentcompute | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - kolla_start | ||
| env: | ||
| - name: KOLLA_CONFIG_STRATEGY | ||
| value: COPY_ALWAYS | ||
| - name: OS_ENDPOINT_TYPE | ||
| value: internal | ||
| image: quay.io/podified-antelope-centos9/openstack-ceilometer-compute@sha256:f6bba9df7ce1d877daa7fe2cd36e5149b99ded1f3e9b88576944d83a4429f25b | ||
| name: ceilometeragentcompute | ||
| securityContext: | ||
| runAsGroup: 42405 | ||
| runAsUser: 42405 | ||
| seLinuxOptions: | ||
| type: ceilometer_polling_t | ||
| volumeMounts: | ||
| - mountPath: /openstack | ||
| name: var-lib-openstack-healthchecks-ceilometer_agent_compute-host-0 | ||
| readOnly: true | ||
| - mountPath: /etc/pki/tls/certs/ca-bundle.trust.crt | ||
| name: etc-pki-tls-certs-ca-bundle.trust.crt-host-1 | ||
| readOnly: true | ||
| - mountPath: /run/libvirt | ||
| name: run-libvirt-host-2 | ||
| readOnly: true | ||
| - mountPath: /dev/log | ||
| name: dev-log-host-3 | ||
| - mountPath: /etc/pki/ca-trust/source/anchors | ||
| name: etc-pki-ca-trust-source-anchors-host-4 | ||
| readOnly: true | ||
| - mountPath: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem | ||
| name: var-lib-openstack-cacerts-telemetry-tls-ca-bundle.pem-host-5 | ||
| readOnly: true | ||
| - mountPath: /var/lib/kolla/config_files/config.json | ||
| name: var-lib-openstack-config-telemetry-ceilometer-agent-compute.json-host-6 | ||
| - mountPath: /etc/hosts | ||
| name: etc-hosts-host-7 | ||
| readOnly: true | ||
| - mountPath: /var/lib/openstack/config/ | ||
| name: var-lib-openstack-config-telemetry-host-8 | ||
| - mountPath: /etc/localtime | ||
| name: etc-localtime-host-9 | ||
| readOnly: true | ||
| hostNetwork: true | ||
| volumes: | ||
| - hostPath: | ||
| path: /var/lib/openstack/healthchecks/ceilometer_agent_compute | ||
| type: Directory | ||
| name: var-lib-openstack-healthchecks-ceilometer_agent_compute-host-0 | ||
| - hostPath: | ||
| path: /etc/pki/tls/certs/ca-bundle.trust.crt | ||
| type: File | ||
| name: etc-pki-tls-certs-ca-bundle.trust.crt-host-1 | ||
| - hostPath: | ||
| path: /run/libvirt | ||
| type: Directory | ||
| name: run-libvirt-host-2 | ||
| - hostPath: | ||
| path: /dev/log | ||
| type: File | ||
| name: dev-log-host-3 | ||
| - hostPath: | ||
| path: /etc/pki/ca-trust/source/anchors | ||
| type: Directory | ||
| name: etc-pki-ca-trust-source-anchors-host-4 | ||
| - hostPath: | ||
| path: /var/lib/openstack/cacerts/telemetry/tls-ca-bundle.pem | ||
| type: File | ||
| name: var-lib-openstack-cacerts-telemetry-tls-ca-bundle.pem-host-5 | ||
| - hostPath: | ||
| path: /var/lib/openstack/config/telemetry/ceilometer-agent-compute.json | ||
| type: File | ||
| name: var-lib-openstack-config-telemetry-ceilometer-agent-compute.json-host-6 | ||
| - hostPath: | ||
| path: /etc/hosts | ||
| type: File | ||
| name: etc-hosts-host-7 | ||
| - hostPath: | ||
| path: /var/lib/openstack/config/telemetry | ||
| type: Directory | ||
| name: var-lib-openstack-config-telemetry-host-8 | ||
| - hostPath: | ||
| path: /etc/localtime | ||
| type: File | ||
| name: etc-localtime-host-9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [install] | ||
| [email protected] | ||
|
|
||
| [Image] | ||
| Image=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| annotations: | ||
| bind-mount-options: /etc/iscsi:z | ||
| creationTimestamp: "2024-12-09T02:00:14Z" | ||
| labels: | ||
| app: iscsid | ||
| name: iscsid | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - kolla_start | ||
| env: | ||
| - name: KOLLA_CONFIG_STRATEGY | ||
| value: COPY_ALWAYS | ||
| image: quay.io/podified-antelope-centos9/openstack-iscsid@sha256:4c9b5389a2564388e7a862d5756c37dc7d9739472b8d822dd6faae868a483a2d | ||
| name: iscsid | ||
| securityContext: | ||
| privileged: true | ||
| procMount: Unmasked | ||
| volumeMounts: | ||
| - mountPath: /etc/pki/ca-trust/source/anchors | ||
| name: etc-pki-ca-trust-source-anchors-host-0 | ||
| readOnly: true | ||
| - mountPath: /etc/target | ||
| name: etc-target-host-1 | ||
| - mountPath: /etc/pki/tls/cert.pem | ||
| name: etc-pki-tls-cert.pem-host-2 | ||
| readOnly: true | ||
| - mountPath: /sys | ||
| name: sys-host-3 | ||
| - mountPath: /dev/log | ||
| name: dev-log-host-4 | ||
| - mountPath: /lib/modules | ||
| name: lib-modules-host-5 | ||
| readOnly: true | ||
| - mountPath: /var/lib/iscsi | ||
| name: var-lib-iscsi-host-6 | ||
| - mountPath: /etc/hosts | ||
| name: etc-hosts-host-7 | ||
| readOnly: true | ||
| - mountPath: /etc/localtime | ||
| name: etc-localtime-host-8 | ||
| readOnly: true | ||
| - mountPath: /etc/pki/tls/certs/ca-bundle.crt | ||
| name: etc-pki-tls-certs-ca-bundle.crt-host-9 | ||
| readOnly: true | ||
| - mountPath: /etc/pki/tls/certs/ca-bundle.trust.crt | ||
| name: etc-pki-tls-certs-ca-bundle.trust.crt-host-10 | ||
| readOnly: true | ||
| - mountPath: /etc/pki/ca-trust/extracted | ||
| name: etc-pki-ca-trust-extracted-host-11 | ||
| readOnly: true | ||
| - mountPath: /var/lib/kolla/config_files/config.json | ||
| name: var-lib-kolla-config_files-iscsid.json-host-12 | ||
| readOnly: true | ||
| - mountPath: /etc/iscsi | ||
| name: etc-iscsi-host-13 | ||
| - mountPath: /run | ||
| name: run-host-14 | ||
| - mountPath: /dev | ||
| name: dev-host-15 | ||
| - mountPath: /openstack | ||
| name: var-lib-openstack-healthchecks-iscsid-host-16 | ||
| readOnly: true | ||
| hostNetwork: true | ||
| volumes: | ||
| - hostPath: | ||
| path: /etc/pki/ca-trust/source/anchors | ||
| type: Directory | ||
| name: etc-pki-ca-trust-source-anchors-host-0 | ||
| - hostPath: | ||
| path: /etc/target | ||
| type: Directory | ||
| name: etc-target-host-1 | ||
| - hostPath: | ||
| path: /etc/pki/tls/cert.pem | ||
| type: File | ||
| name: etc-pki-tls-cert.pem-host-2 | ||
| - hostPath: | ||
| path: /sys | ||
| type: Directory | ||
| name: sys-host-3 | ||
| - hostPath: | ||
| path: /dev/log | ||
| type: File | ||
| name: dev-log-host-4 | ||
| - hostPath: | ||
| path: /lib/modules | ||
| type: Directory | ||
| name: lib-modules-host-5 | ||
| - hostPath: | ||
| path: /var/lib/iscsi | ||
| type: Directory | ||
| name: var-lib-iscsi-host-6 | ||
| - hostPath: | ||
| path: /etc/hosts | ||
| type: File | ||
| name: etc-hosts-host-7 | ||
| - hostPath: | ||
| path: /etc/localtime | ||
| type: File | ||
| name: etc-localtime-host-8 | ||
| - hostPath: | ||
| path: /etc/pki/tls/certs/ca-bundle.crt | ||
| type: File | ||
| name: etc-pki-tls-certs-ca-bundle.crt-host-9 | ||
| - hostPath: | ||
| path: /etc/pki/tls/certs/ca-bundle.trust.crt | ||
| type: File | ||
| name: etc-pki-tls-certs-ca-bundle.trust.crt-host-10 | ||
| - hostPath: | ||
| path: /etc/pki/ca-trust/extracted | ||
| type: Directory | ||
| name: etc-pki-ca-trust-extracted-host-11 | ||
| - hostPath: | ||
| path: /var/lib/kolla/config_files/iscsid.json | ||
| type: File | ||
| name: var-lib-kolla-config_files-iscsid.json-host-12 | ||
| - hostPath: | ||
| path: /etc/iscsi | ||
| type: Directory | ||
| name: etc-iscsi-host-13 | ||
| - hostPath: | ||
| path: /run | ||
| type: Directory | ||
| name: run-host-14 | ||
| - hostPath: | ||
| path: /dev | ||
| type: Directory | ||
| name: dev-host-15 | ||
| - hostPath: | ||
| path: /var/lib/openstack/healthchecks/iscsid | ||
| type: Directory | ||
| name: var-lib-openstack-healthchecks-iscsid-host-16 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [install] | ||
| WantedBy=edpm-compute@logrotate_crond.service | ||
|
|
||
| [Image] | ||
| Image=quay.io/podified-antelope-centos9/openstack-cron:current-podified |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't re-format from spaces to tabs