Update IPA packages in ironic

This PS updates ironic deployment with IPA init container
which contains python agent agent packages which are ubuntu based
packages. The docker image for this can found here [0]

[0]
https://opendev.org/airship/images/src/branch/master/ipa-downloader-image

Change-Id: Idaaafb2ddb562cf22a62df36100dd1e6c76211fc
This commit is contained in:
Battina, Sai (sb464f) 2020-12-03 13:24:35 -06:00 committed by sai battina
parent b5b03bb1de
commit f49b509534
8 changed files with 36 additions and 25 deletions

View File

@ -4,6 +4,6 @@
echo In inspector.ipxe echo In inspector.ipxe
imgfree imgfree
# NOTE(dtantsur): keep inspection kernel params in [mdns]params in ironic-inspector-image # NOTE(dtantsur): keep inspection kernel params in [mdns]params in ironic-inspector-image
kernel --timeout 60000 http://$(PROVISIONING_IP):80/images/tinyipa-stable-ussuri.vmlinuz ipa-inspection-callback-url=http://$(PROVISIONING_IP):5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=tinyipa-stable-ussuri.gz || goto retry_boot kernel --timeout 60000 http://$(PROVISIONING_IP):80/images/ipa-ubuntu-master.kernel ipa-inspection-callback-url=http://$(PROVISIONING_IP):5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ipa-ubuntu-master.initramfs || goto retry_boot
initrd --timeout 60000 http://$(PROVISIONING_IP):80/images/tinyipa-stable-ussuri.gz || goto retry_boot initrd --timeout 60000 http://$(PROVISIONING_IP):80/images/ipa-ubuntu-master.initramfs || goto retry_boot
boot boot

View File

@ -31,20 +31,6 @@ for f in $( ls ); do
done done
popd popd
pushd /shared/html/images
STATUSCODE=$(curl --silent --insecure --location -O --write-out "%{http_code}" ${IPA_RAMDISK})
if test $STATUSCODE -ne 200; then
echo "Failed to load ${ARTS[${art}]}"
exit 1
fi
STATUSCODE=$(curl --silent --insecure --location -O --write-out "%{http_code}" ${IPA_KERNEL})
if test $STATUSCODE -ne 200; then
echo "Failed to load ${ARTS[${art}]}"
exit 1
fi
popd
chmod -R 0777 /shared/html chmod -R 0777 /shared/html
touch /shared/init_finished touch /shared/init_finished

View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -xe
#Copy files to shared mount
cp -f /ipa-ubuntu-master* /shared/html/images/
chmod 777 -R /shared/html/images/

View File

@ -1,5 +1,9 @@
#!/usr/bin/bash #!/usr/bin/bash
. /bin/ironic-common.sh
wait_for_interface_or_ip
ironic-inspector-dbsync --config-file /shared/inspector.conf upgrade ironic-inspector-dbsync --config-file /shared/inspector.conf upgrade
exec /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf \ exec /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf \

View File

@ -6,6 +6,7 @@ configMapGenerator:
files: files:
- dnsmasq-entrypoint - dnsmasq-entrypoint
- httpd-entrypoint - httpd-entrypoint
- init-images
- init-bootstrap - init-bootstrap
- inspector-entrypoint - inspector-entrypoint
- ironic-entrypoint - ironic-entrypoint

View File

@ -19,13 +19,11 @@ data:
# Overrideable via the `replacements` entrypoint and networking catalogue # Overrideable via the `replacements` entrypoint and networking catalogue
PROVISIONING_INTERFACE: "pxe" PROVISIONING_INTERFACE: "pxe"
HTTP: "80" HTTP: "80"
DEPLOY_KERNEL_PATH: "/images/tinyipa-stable-ussuri.vmlinuz" DEPLOY_KERNEL_PATH: "/images/ipa-ubuntu-master.kernel"
DEPLOY_RAMDISK_PATH: "/images/tinyipa-stable-ussuri.gz" DEPLOY_RAMDISK_PATH: "/images/ipa-ubuntu-master.initramfs"
FAST_TRACK: "false" FAST_TRACK: "false"
API_WORKERS: "4" API_WORKERS: "4"
AUTOMATED_CLEAN: "true" AUTOMATED_CLEAN: "true"
IRONIC_VOLUME_CAPACITY: "10Gi" IRONIC_VOLUME_CAPACITY: "10Gi"
IRONIC_STORAGE_CLASS_NAME: "default" IRONIC_STORAGE_CLASS_NAME: "default"
IRONIC_HOST_PATH: "/opt/metal3-dev-env/ironic/" IRONIC_HOST_PATH: "/opt/metal3-dev-env/ironic/"
IPA_RAMDISK: "https://tarballs.opendev.org/openstack/ironic-python-agent/tinyipa/files/tinyipa-stable-ussuri.gz"
IPA_KERNEL: "https://tarballs.opendev.org/openstack/ironic-python-agent/tinyipa/files/tinyipa-stable-ussuri.vmlinuz"

View File

@ -36,6 +36,9 @@ spec:
image: "centos" image: "centos"
imagePullPolicy: Always imagePullPolicy: Always
command: ['/bin/init-bootstrap'] command: ['/bin/init-bootstrap']
envFrom:
- configMapRef:
name: ironic-vars
volumeMounts: volumeMounts:
- name: ironic-storage - name: ironic-storage
mountPath: "/shared" mountPath: "/shared"
@ -46,6 +49,16 @@ spec:
mountPath: /cfg mountPath: /cfg
- name: ironic-vars - name: ironic-vars
mountPath: /ironic-vars mountPath: /ironic-vars
- name: init-images
image: quay.io/airshipit/ipa:latest
imagePullPolicy: Always
command: ['/bin/init-images']
volumeMounts:
- name: ironic-storage
mountPath: "/shared"
- name: ironic-entrypoints
mountPath: /bin/init-images
subPath: init-images
containers: containers:
- name: dnsmasq - name: dnsmasq
image: "quay.io/metal3-io/ironic:latest" image: "quay.io/metal3-io/ironic:latest"
@ -88,6 +101,9 @@ spec:
image: "quay.io/metal3-io/ironic-inspector:latest" image: "quay.io/metal3-io/ironic-inspector:latest"
imagePullPolicy: Always imagePullPolicy: Always
command: ["/bin/runironic-inspector"] command: ["/bin/runironic-inspector"]
envFrom:
- configMapRef:
name: ironic-vars
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:

View File

@ -92,15 +92,15 @@
ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}" ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
ephemeral_vm_memory_mb: 6124 ephemeral_vm_memory_mb: 6124
ephemeral_vm_vcpus: 4 ephemeral_vm_vcpus: 4
target_disk_size: 10G target_disk_size: 20G
target_vm_cfg: "{{ target_vm_cfg }}" target_vm_cfg: "{{ target_vm_cfg }}"
target_vm_memory_mb: 4096 target_vm_memory_mb: 6124
target_vm_vcpus: 2 target_vm_vcpus: 2
target_vms_count: 1 target_vms_count: 1
worker_disk_size: 10G worker_disk_size: 20G
worker_vm_cfg: "{{ worker_vm_cfg }}" worker_vm_cfg: "{{ worker_vm_cfg }}"
worker_vm_memory_mb: 1024 worker_vm_memory_mb: 6124
worker_vm_vcpus: 1 worker_vm_vcpus: 2
worker_vms_count: 1 worker_vms_count: 1
airship_gate_file_exchanger: airship_gate_file_exchanger:
servername: "localhost" servername: "localhost"