Single puppet manifest for AIO controllers

Create a single puppet manifest for AIO controllers.
This change includes:
1. remove workerconfig from an AIO controller deployment
2. running puppet based on subfunctions of the nodes

Depends-on: https://review.opendev.org/c/starlingx/stx-puppet/+/780600
Partial-Bug: 1918139
Signed-off-by: Bin Qian <bin.qian@windriver.com>
Change-Id: Ie3693219e3c19460ac5b617cc216cbc809ec2403
This commit is contained in:
Bin Qian
2021-02-23 12:59:28 -05:00
parent a40a3bd892
commit 6acd2e3564
6 changed files with 1 additions and 68 deletions

View File

@@ -23,13 +23,6 @@ Group: System/Packages
%description -n workerconfig-standalone
Initial worker node configuration for StarlingX project.
%package -n workerconfig-subfunction
Summary: The worker config subfunction package
Group: System/Packages
%description -n workerconfig-subfunction
Initial worker node configuration for StarlingX project.
%define initddir %{_sysconfdir}/init.d/
%define goenableddir %{_sysconfdir}/goenabled.d/
%define systemddir %{_sysconfdir}/systemd/system/
@@ -46,11 +39,6 @@ make install INITDDIR=%{buildroot}%{initddir} GOENABLEDDIR=%{buildroot}%{goenabl
cp $D%{systemddir}/config/workerconfig-standalone.service $D%{systemddir}/workerconfig.service
systemctl enable workerconfig.service
%post -n workerconfig-subfunction
cp $D%{systemddir}/config/workerconfig-combined.service $D%{systemddir}/workerconfig.service
systemctl enable workerconfig.service
%clean
%files
@@ -68,12 +56,4 @@ systemctl enable workerconfig.service
%dir %{_sysconfdir}/systemd/system
%config %{systemddir}/config/workerconfig-standalone.service
%files -n workerconfig-subfunction
%defattr(-,root,root,-)
%dir %{systemddir}/config
%{systemddir}/config/workerconfig-combined.service
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%config %{systemddir}/config/workerconfig-combined.service
%changelog