Bug: fix the aa-kbc-params error in fedora

Fixes: confidential-containers#1852 Signed-off-by: Qi Feng Huo <huoqif@cn.ibm.com>
huoqifeng · Jun 6, 2024 · 479a508 · 479a508
1 parent b04ccd0
commit 479a508
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/src/cloud-api-adaptor/cmd/process-user-data/main.go b/src/cloud-api-adaptor/cmd/process-user-data/main.go
@@ -19,7 +19,7 @@ const (
 	providerAzure = "azure"
 	providerAws   = "aws"
 
-	defaultAgentConfigPath = "/etc/agent-config.toml"
+	defaultAgentConfigPath = "/run/peerpod/agent-config.toml"
 	defaultAuthJsonPath    = "/run/peerpod/auth.json"
 )
 

diff --git a/src/cloud-api-adaptor/podvm/files/etc/systemd/system/kata-agent.service b/src/cloud-api-adaptor/podvm/files/etc/systemd/system/kata-agent.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Kata Agent
 BindsTo=netns@podns.service
-Wants=process-user-data.service
-After=netns@podns.service process-user-data.service
+Wants=process-user-data-update.service
+After=netns@podns.service process-user-data-update.service
 
 [Service]
 Environment=CDH_CONFIG_PATH=/run/confidential-containers/cdh.toml

diff --git a/...odvm/files/etc/systemd/system/multi-user.target.wants/process-user-data-provision.service b/...odvm/files/etc/systemd/system/multi-user.target.wants/process-user-data-provision.service
@@ -0,0 +1 @@
+../process-user-data-provision.service
diff --git a/...r/podvm/files/etc/systemd/system/multi-user.target.wants/process-user-data-update.service b/...r/podvm/files/etc/systemd/system/multi-user.target.wants/process-user-data-update.service
@@ -0,0 +1 @@
+../process-user-data-update.service
diff --git a/...-adaptor/podvm/files/etc/systemd/system/multi-user.target.wants/process-user-data.service b/...-adaptor/podvm/files/etc/systemd/system/multi-user.target.wants/process-user-data.service
diff --git a/.../systemd/system/process-user-data.service → ...ystem/process-user-data-provision.service b/.../systemd/system/process-user-data.service → ...ystem/process-user-data-provision.service
@@ -2,15 +2,14 @@
 # It must run before kata-agent.service
 
 [Unit]
-Description=Process user data
+Description=Process user data and provision
 After=network.target
 DefaultDependencies=no
 
 
 [Service]
 Type=oneshot
 ExecStartPre=/usr/local/bin/process-user-data provision-files
-ExecStart=/usr/local/bin/process-user-data update-agent-config
 RemainAfterExit=yes
 
 [Install]

diff --git a/src/cloud-api-adaptor/podvm/files/etc/systemd/system/process-user-data-update.service b/src/cloud-api-adaptor/podvm/files/etc/systemd/system/process-user-data-update.service
@@ -0,0 +1,17 @@
+# One-shot systemd service for running the process-user-data binary
+# It must run before kata-agent.service
+
+[Unit]
+Description=Process user data and update
+After=network.target cloud-final.service process-user-data-provision
+DefaultDependencies=no
+
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/process-user-data update-agent-config
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+PartOf=process-user-data-provision.service