Skip to content

Commit 27520f8

Browse files
authored
packaging: bundle cmk in cloudstack-management package (#8574)
This bundles latest cmk release in cloudstack-management package, so admins won't need to install it for typical first-install use. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent a1f547a commit 27520f8

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

debian/cloudstack-management.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
/usr/bin/cloudstack-migrate-databases
3636
/usr/bin/cloudstack-setup-encryption
3737
/usr/bin/cloudstack-sysvmadm
38+
/usr/bin/cmk
3839
/usr/share/cloudstack-management/*

debian/rules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ override_dh_auto_install:
8484
cp -r engine/schema/dist/systemvm-templates/* $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/
8585
rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/md5sum.txt
8686

87+
# Bundle cmk in cloudstack-management
88+
wget https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64 -O $(DESTDIR)/usr/bin/cmk
89+
chmod +x $(DESTDIR)/usr/bin/cmk
90+
8791
# nast hack for a couple of configuration files
8892
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-limits.conf $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
8993
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-sudoers $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)

packaging/centos7/cloud.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%
277277
install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
278278
install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
279279
install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
280+
# Bundle cmk in cloudstack-management
281+
wget https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64 -O ${RPM_BUILD_ROOT}%{_bindir}/cmk
282+
chmod +x ${RPM_BUILD_ROOT}%{_bindir}/cmk
280283

281284
cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
282285

@@ -609,6 +612,7 @@ pip3 install --upgrade urllib3
609612
%attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
610613
%attr(0755,root,root) %{_bindir}/%{name}-sysvmadm
611614
%attr(0755,root,root) %{_bindir}/%{name}-setup-encryption
615+
%attr(0755,root,root) %{_bindir}/cmk
612616
%{_datadir}/%{name}-management/setup/*.sql
613617
%{_datadir}/%{name}-management/setup/*.sh
614618
%{_datadir}/%{name}-management/setup/server-setup.xml

packaging/centos8/cloud.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%
259259
install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
260260
install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
261261
install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
262+
# Bundle cmk in cloudstack-management
263+
wget https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64 -O ${RPM_BUILD_ROOT}%{_bindir}/cmk
264+
chmod +x ${RPM_BUILD_ROOT}%{_bindir}/cmk
262265

263266
cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
264267

@@ -588,6 +591,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
588591
%attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
589592
%attr(0755,root,root) %{_bindir}/%{name}-sysvmadm
590593
%attr(0755,root,root) %{_bindir}/%{name}-setup-encryption
594+
%attr(0755,root,root) %{_bindir}/cmk
591595
%{_datadir}/%{name}-management/setup/*.sql
592596
%{_datadir}/%{name}-management/setup/*.sh
593597
%{_datadir}/%{name}-management/setup/server-setup.xml

0 commit comments

Comments
 (0)