From 3f181357cc7f6e2270e641c5e6ba3ce5f6f711a4 Mon Sep 17 00:00:00 2001 From: Hugo Brito Date: Mon, 8 Aug 2022 13:11:24 -0300 Subject: [PATCH] debian: port rvmc docker image to Debian This commit enables the creation of rvmc docker image by both distros: CentOS and Debian. Test Plan: PASS - Install DC subcloud using Debian image 1. Build rvmc image using stx-debian. 2. Push the new rvmc image to a DC lab registry. 3. Modify the dccommon subcloud_install pointing to the new rvmc image. 4. Install a new subcloud using the new rvmc image. PASS - Install DC subcloud using CentOS image (same steps as Debian) Story: 2009831 Task: 45969 Signed-off-by: Hugo Brito Change-Id: I11a9f331cfd1a03d7b5a99223203b240fb31d88b --- debian_stable_docker_images.inc | 1 + tools/rvmc/centos/{docker => }/Dockerfile | 1 - tools/rvmc/centos/rvmc.stable_docker_image | 2 ++ tools/rvmc/debian/Dockerfile | 19 +++++++++++++++++++ tools/rvmc/debian/rvmc.stable_docker_image | 4 ++++ .../docker/examples/rvmc_job.yaml | 0 .../rvmc_multi_target_config_example.yaml | 0 .../docker/examples/rvmc_pod.yaml | 0 .../rvmc_single_target_config_example.yaml | 0 tools/rvmc/{centos => }/docker/rvmc.py | 0 tox.ini | 2 +- 11 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 debian_stable_docker_images.inc rename tools/rvmc/centos/{docker => }/Dockerfile (99%) create mode 100644 tools/rvmc/debian/Dockerfile create mode 100644 tools/rvmc/debian/rvmc.stable_docker_image rename tools/rvmc/{centos => }/docker/examples/rvmc_job.yaml (100%) rename tools/rvmc/{centos => }/docker/examples/rvmc_multi_target_config_example.yaml (100%) rename tools/rvmc/{centos => }/docker/examples/rvmc_pod.yaml (100%) rename tools/rvmc/{centos => }/docker/examples/rvmc_single_target_config_example.yaml (100%) rename tools/rvmc/{centos => }/docker/rvmc.py (100%) diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc new file mode 100644 index 00000000..ce6f525c --- /dev/null +++ b/debian_stable_docker_images.inc @@ -0,0 +1 @@ +tools/rvmc diff --git a/tools/rvmc/centos/docker/Dockerfile b/tools/rvmc/centos/Dockerfile similarity index 99% rename from tools/rvmc/centos/docker/Dockerfile rename to tools/rvmc/centos/Dockerfile index 5cdcb9ec..2ea94690 100644 --- a/tools/rvmc/centos/docker/Dockerfile +++ b/tools/rvmc/centos/Dockerfile @@ -7,4 +7,3 @@ COPY rvmc.py /usr/local/bin ENV debug=0 ENV target=None ENTRYPOINT /usr/local/bin/rvmc.py --target $target --debug $debug - diff --git a/tools/rvmc/centos/rvmc.stable_docker_image b/tools/rvmc/centos/rvmc.stable_docker_image index d5f65494..ba46a0a4 100644 --- a/tools/rvmc/centos/rvmc.stable_docker_image +++ b/tools/rvmc/centos/rvmc.stable_docker_image @@ -1,2 +1,4 @@ BUILDER=docker LABEL=rvmc +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile diff --git a/tools/rvmc/debian/Dockerfile b/tools/rvmc/debian/Dockerfile new file mode 100644 index 00000000..d11fdfe0 --- /dev/null +++ b/tools/rvmc/debian/Dockerfile @@ -0,0 +1,19 @@ +ARG BASE +FROM ${BASE} + +ENV debug=0 +ENV target=None +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get -y update \ + && apt-get -y install \ + iproute2 \ + iputils-ping \ + python3-pip \ + ntp \ + time +RUN pip3 install pyyaml \ + && pip3 install redfish + +COPY ./rvmc.py /usr/local/bin +ENTRYPOINT /usr/local/bin/rvmc.py --target $target --debug $debug diff --git a/tools/rvmc/debian/rvmc.stable_docker_image b/tools/rvmc/debian/rvmc.stable_docker_image new file mode 100644 index 00000000..ba46a0a4 --- /dev/null +++ b/tools/rvmc/debian/rvmc.stable_docker_image @@ -0,0 +1,4 @@ +BUILDER=docker +LABEL=rvmc +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile diff --git a/tools/rvmc/centos/docker/examples/rvmc_job.yaml b/tools/rvmc/docker/examples/rvmc_job.yaml similarity index 100% rename from tools/rvmc/centos/docker/examples/rvmc_job.yaml rename to tools/rvmc/docker/examples/rvmc_job.yaml diff --git a/tools/rvmc/centos/docker/examples/rvmc_multi_target_config_example.yaml b/tools/rvmc/docker/examples/rvmc_multi_target_config_example.yaml similarity index 100% rename from tools/rvmc/centos/docker/examples/rvmc_multi_target_config_example.yaml rename to tools/rvmc/docker/examples/rvmc_multi_target_config_example.yaml diff --git a/tools/rvmc/centos/docker/examples/rvmc_pod.yaml b/tools/rvmc/docker/examples/rvmc_pod.yaml similarity index 100% rename from tools/rvmc/centos/docker/examples/rvmc_pod.yaml rename to tools/rvmc/docker/examples/rvmc_pod.yaml diff --git a/tools/rvmc/centos/docker/examples/rvmc_single_target_config_example.yaml b/tools/rvmc/docker/examples/rvmc_single_target_config_example.yaml similarity index 100% rename from tools/rvmc/centos/docker/examples/rvmc_single_target_config_example.yaml rename to tools/rvmc/docker/examples/rvmc_single_target_config_example.yaml diff --git a/tools/rvmc/centos/docker/rvmc.py b/tools/rvmc/docker/rvmc.py similarity index 100% rename from tools/rvmc/centos/docker/rvmc.py rename to tools/rvmc/docker/rvmc.py diff --git a/tox.ini b/tox.ini index ef86ed49..8e2ee447 100644 --- a/tox.ini +++ b/tox.ini @@ -48,7 +48,7 @@ deps = {[testenv]deps} pylint commands = pylint {posargs} --rcfile=./pylint.rc \ - tools/rvmc/centos/docker/rvmc.py \ + tools/rvmc/docker/rvmc.py \ mtce/src/hwmon/scripts/hwmond_notify.py [testenv:pep8]