From 2a8fcfc54ba7d54a89cfe49024e74976e6248dc6 Mon Sep 17 00:00:00 2001 From: Victor Romano Date: Mon, 29 Jul 2024 00:44:13 -0300 Subject: [PATCH] Add necessary information to build puppet-dcagent The commit [1] that introduced puppet-dcagent did not include any information to build the package and include it in the ISO. This commit fixes this by including the entries in debian_pkg_dirs and debian_iso_image.inc. Test plan: - PASS: Build an ISO and verify the puppet-dcagent is indeed present - PASS: Deploy a full DC system with AIO-DX system controller and an AIO-SX subcloud and verify the systems are operational after completion. - PASS: Deploy a normal AIO-SX and verify the system is operational after completion. [1]: https://review.opendev.org/c/starlingx/stx-puppet/+/923696 Story: 2011106 Task: 50687 Change-Id: I172128ade009bd334af13d773b16d5c35db1fd21 Signed-off-by: Victor Romano --- debian_iso_image.inc | 3 +++ debian_pkg_dirs | 1 + modules/puppet-dcagent/debian/deb_folder/control | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian_iso_image.inc b/debian_iso_image.inc index eee46d1d5..6719a1612 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -1,4 +1,7 @@ +#puppet-dcagent +puppet-dcagent + #puppet-dcdbsync puppet-dcdbsync diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 60c0b4662..68dfba45d 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,4 +1,5 @@ puppet-manifests +modules/puppet-dcagent modules/puppet-dcdbsync modules/puppet-dcmanager modules/puppet-dcorch diff --git a/modules/puppet-dcagent/debian/deb_folder/control b/modules/puppet-dcagent/debian/deb_folder/control index 35ee7280e..bcc2b7a30 100644 --- a/modules/puppet-dcagent/debian/deb_folder/control +++ b/modules/puppet-dcagent/debian/deb_folder/control @@ -1,4 +1,4 @@ -Source: puppet-dcagemt +Source: puppet-dcagent Section: admin Priority: optional Maintainer: StarlingX Developers