@@ -82,8 +82,7 @@ Requires: %{name}-common = %{_ver}
8282Requires: (iptables-services or iptables)
8383Requires: rng-tools
8484Requires: (qemu-img or qemu-tools)
85- Requires: python3-pip
86- Requires: python3-setuptools
85+ Requires: mysql-connector-python3
8786Requires: (libgcrypt > 1.8.3 or libgcrypt20)
8887Group: System Environment/Libraries
8988%description management
@@ -255,7 +254,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
255254mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir }/%{name }/management
256255mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir }/systemd/system/%{name }-management.service.d
257256mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir }/run
258- mkdir -p ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/setup/wheel
259257
260258# Setup Jetty
261259ln -sf /etc/%{name }/management ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/conf
@@ -334,11 +332,6 @@ cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
334332rm -f ${RPM_BUILD_ROOT}%{_datadir }/%{name }-ui/config.json
335333ln -sf /etc/%{name }/ui/config.json ${RPM_BUILD_ROOT}%{_datadir }/%{name }-ui/config.json
336334
337- # Package mysql-connector-python
338- wget -P ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/setup/wheel https://files.pythonhosted.org/packages/ee/ff/48bde5c0f013094d729fe4b0316ba2a24774b3ff1c52d924a8a4cb04078a/six-1.15.0-py2.py3-none-any.whl
339- wget -P ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/setup/wheel https://files.pythonhosted.org/packages/e9/93/4860cebd5ad3ff2664ad3c966490ccb46e3b88458b2095145bca11727ca4/setuptools-47.3.1-py3-none-any.whl
340- wget -P ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/setup/wheel https://files.pythonhosted.org/packages/32/27/1141a8232723dcb10a595cc0ce4321dcbbd5215300bf4acfc142343205bf/protobuf-3.19.6-py2.py3-none-any.whl
341- wget -P ${RPM_BUILD_ROOT}%{_datadir }/%{name }-management/setup/wheel https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
342335
343336chmod 440 ${RPM_BUILD_ROOT}%{_sysconfdir }/sudoers.d/%{name }-management
344337chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/%{name }/mnt
455448fi
456449
457450%post management
458- # Install mysql-connector-python
459- pip3 install %{_datadir }/%{name }-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl %{_datadir }/%{name }-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl %{_datadir }/%{name }-management/setup/wheel/protobuf-3.19.6-py2.py3-none-any.whl %{_datadir }/%{name }-management/setup/wheel/mysql_connector_python-8.0.31-py2.py3-none-any.whl
460-
461451/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
462452/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
463453
@@ -643,7 +633,6 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
643633%dir %attr(0770,root,root) %{_localstatedir }/log/%{name }/ipallocator
644634%{_defaultdocdir }/%{name }-management-%{version }/LICENSE
645635%{_defaultdocdir }/%{name }-management-%{version }/NOTICE
646- %{_datadir }/%{name }-management/setup/wheel/* .whl
647636%dir %attr(0755,cloud,cloud) %{_sysconfdir }/%{name }/extensions
648637%attr(0755,cloud,cloud) %{_sysconfdir }/%{name }/extensions/*
649638
0 commit comments