Align drivetrain-ha-oss model according to drivetrain-ha

Change-Id: I68323a114de8329bcadc14098de0b3807381a858
Needed-by: Ib790fd65113fa62e62ec3b3cf715bebdec95e06c
diff --git a/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml b/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
index 9771de0..4e1058a 100644
--- a/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
+++ b/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
@@ -35,7 +35,7 @@
   # OpenLDAP
   - system.openldap.client
   - system.openldap.client.people.admin
-
+  - cluster.drivetrain-ha-oss.cicd.control
   - cluster.drivetrain-ha-oss
 
 parameters:
diff --git a/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml b/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
index 10aad44..38b51bd 100644
--- a/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
+++ b/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
@@ -1,3 +1,4 @@
 classes:
   - system.docker.swarm.manager
+  - cluster.drivetrain-ha-oss.cicd.control
   - cluster.drivetrain-ha-oss
diff --git a/classes/cluster/drivetrain-ha-oss/init.yml b/classes/cluster/drivetrain-ha-oss/init.yml
index bcd025b..f17aca8 100644
--- a/classes/cluster/drivetrain-ha-oss/init.yml
+++ b/classes/cluster/drivetrain-ha-oss/init.yml
@@ -6,5 +6,5 @@
   - system.linux.system.motd.dynamic
   - system.openssh.server.team.all
   - cluster.drivetrain-ha-oss.infra
-  - cluster.drivetrain-ha-oss.cicd.control
+  - cluster.drivetrain-ha-oss.cicd
   - cluster.overrides