aboutsummaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-01 13:41:14 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-09 17:44:26 +0200
commit1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch)
tree05427aa46ce6473684cfe2a824798306291546c9 /docker/ironic
parentcabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff)
downloadkolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz
kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are welcome how to split it into parts or handle better. Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-api/Dockerfile.j218
-rw-r--r--docker/ironic/ironic-base/Dockerfile.j213
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j2118
3 files changed, 35 insertions, 114 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index d90992ee0..7f4b8b880 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -7,23 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- {% set ironic_api_packages = [
- 'openstack-ironic-api'
- ] %}
- {% elif base_package_type == 'deb' %}
- {% set ironic_api_packages = [
- 'ironic-api'
- ] %}
- {% endif %}
+{% set ironic_api_packages = [
+] %}
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
-{% elif install_type == 'source' %}
-
- {% set ironic_api_packages = [
- ] %}
-{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
-{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index 9e83b3c69..41119c37b 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -9,17 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ironic') }}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- {% set ironic_base_packages = ['openstack-ironic-common'] %}
- {% elif base_package_type == 'deb' %}
- {% set ironic_base_packages = ['ironic-common'] %}
- {% endif %}
-
-{{ macros.install_packages(ironic_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
ADD ironic-base-archive /ironic-base-source
{% set ironic_base_pip_packages = [
@@ -37,8 +26,6 @@ ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_ironic_sudoers
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_ironic_extend_start \
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 5883f604f..63e48d1ea 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -7,90 +7,39 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- # TODO(Jeffrey4l): no python-oneviewclient
- {% set ironic_conductor_packages = [
- 'dosfstools',
- 'e2fsprogs',
- 'gdisk',
- 'ipmitool',
- 'openssh-clients',
- 'openstack-ironic-conductor',
- 'openstack-ironic-staging-drivers',
- 'parted',
- 'psmisc',
- 'python3dist\(ansible\)',
- 'python3-dracclient',
- 'python3-ironic-inspector-client',
- 'python3-proliantutils',
- 'python3-pysnmp',
- 'python3-scciclient',
- 'python3-sushy',
- 'python3-systemd',
- 'qemu-img',
- 'util-linux',
- 'xfsprogs'
- ] %}
- {% elif base_package_type == 'deb' %}
- # TODO(jeffrey4l): no python-dracclient, python-oneviewclient,
- # python-sushy, ironic-staging-drivers
- {% set ironic_conductor_packages = [
- 'ansible',
- 'bsdmainutils',
- 'dosfstools',
- 'e2fsprogs',
- 'gdisk',
- 'ipmitool',
- 'ironic-conductor',
- 'openssh-client',
- 'parted',
- 'psmisc',
- 'python3-ironic-inspector-client',
- 'python3-proliantutils',
- 'python3-pysnmp4',
- 'python3-scciclient',
- 'python3-systemd',
- 'qemu-utils',
- 'shellinabox',
- 'udev',
- 'xfsprogs',
- ] %}
- {% endif %}
-{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
- {% set ironic_conductor_packages = [
- 'dosfstools',
- 'e2fsprogs',
- 'fuse',
- 'gdisk',
- 'ipmitool',
- 'openssh-clients',
- 'parted',
- 'psmisc',
- 'python3-systemd',
- 'qemu-img',
- 'systemd-udev',
- 'util-linux',
- 'xfsprogs',
- ] %}
- {% elif base_package_type == 'deb' %}
- {% set ironic_conductor_packages = [
- 'bsdmainutils',
- 'dosfstools',
- 'e2fsprogs',
- 'gdisk',
- 'ipmitool',
- 'openssh-client',
- 'parted',
- 'psmisc',
- 'python3-systemd',
- 'qemu-utils',
- 'shellinabox',
- 'udev',
- 'xfsprogs',
- ] %}
- {% endif %}
+{% if base_package_type == 'rpm' %}
+ {% set ironic_conductor_packages = [
+ 'dosfstools',
+ 'e2fsprogs',
+ 'fuse',
+ 'gdisk',
+ 'ipmitool',
+ 'openssh-clients',
+ 'parted',
+ 'psmisc',
+ 'python3-systemd',
+ 'qemu-img',
+ 'systemd-udev',
+ 'util-linux',
+ 'xfsprogs',
+ ] %}
+{% elif base_package_type == 'deb' %}
+ {% set ironic_conductor_packages = [
+ 'bsdmainutils',
+ 'dosfstools',
+ 'e2fsprogs',
+ 'gdisk',
+ 'ipmitool',
+ 'openssh-client',
+ 'parted',
+ 'psmisc',
+ 'python3-systemd',
+ 'qemu-utils',
+ 'shellinabox',
+ 'udev',
+ 'xfsprogs',
+ ] %}
+{% endif %}
{% set ironic_conductor_pip_packages = [
'-r /ironic/driver-requirements.txt',
@@ -98,7 +47,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_packages")) }}
-{% endif %}
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}