apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-7671: Management server restart failed after reboot"

Browse Source 
This reverts commit e8f1c592120707ac214d535a6637fa7dc5826289.
This commit is contained in:
Nitin Mehta 2014-10-07 13:28:25 -07:00
parent f4326aec82
commit e2ca6e38d5
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/centos63/cloud.spec
View File

@ -273,7 +273,6 @@ install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%
install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
%{_cloudstackmanagementconf}
cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
@ -629,7 +628,6 @@ fi
%{_defaultdocdir}/%{name}-management-%{version}/LICENSE %{_defaultdocdir}/%{name}-management-%{version}/LICENSE
%{_defaultdocdir}/%{name}-management-%{version}/NOTICE %{_defaultdocdir}/%{name}-management-%{version}/NOTICE
%attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out %attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out
%{_cloudstackmanagementconfattr}
%files agent %files agent
%attr(0755,root,root) %{_bindir}/%{name}-setup-agent %attr(0755,root,root) %{_bindir}/%{name}-setup-agent

2
packaging/centos63/default/macros.spec
View File

@ -25,5 +25,3 @@
%define _managementserviceattribute %{nil} %define _managementserviceattribute %{nil}
%define _iptablesservice %{nil} %define _iptablesservice %{nil}
%define _serverxmlname server %define _serverxmlname server
%define _cloudstackmanagementconf %{nil}
%define _cloudstackmanagementconfattr %{nil}

18
packaging/centos63/rhel7/cloudstack-management.conf
View File

@ -1,18 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
f /var/run/cloudstack-management.pid 0644 cloud cloud -

2
packaging/centos63/rhel7/macros.spec
View File

@ -25,5 +25,3 @@
%define _managementserviceattribute %attr(0755,root,root) %{_unitdir}/%{name}-management.service %define _managementserviceattribute %attr(0755,root,root) %{_unitdir}/%{name}-management.service
%define _iptablesservice Requires: iptables-services %define _iptablesservice Requires: iptables-services
%define _serverxmlname server7 %define _serverxmlname server7
%define _cloudstackmanagementconf install -D packaging/centos63/%{_os}/%{name}-management.conf ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-management.conf
%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf