Skip to content

Commit e8f1c59

Browse files
Damodarkishankavala
Damodar
authored and
kishankavala
committed
CLOUDSTACK-7671: Management server restart failed after reboot
1 parent 67ff7da commit e8f1c59

4 files changed

Lines changed: 26 additions & 2 deletions

File tree

‎packaging/centos63/cloud.spec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%
273273
install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
274274
install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
275275
install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
276+
%{_cloudstackmanagementconf}
276277

277278
cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
278279
cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
@@ -628,6 +629,7 @@ fi
628629
%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
629630
%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
630631
%attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out
632+
%{_cloudstackmanagementconfattr}
631633

632634
%files agent
633635
%attr(0755,root,root) %{_bindir}/%{name}-setup-agent

‎packaging/centos63/default/macros.spec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@
2424
%define _managementservice %{nil}
2525
%define _managementserviceattribute %{nil}
2626
%define _iptablesservice %{nil}
27-
%define _serverxmlname server
27+
%define _serverxmlname server
28+
%define _cloudstackmanagementconf %{nil}
29+
%define _cloudstackmanagementconfattr %{nil}

‎packaging/centos63/rhel7/cloudstack-management.conf‎

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

‎packaging/centos63/rhel7/macros.spec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@
2424
%define _managementservice install -D packaging/centos63/%{_os}/cloud-management.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-management.service
2525
%define _managementserviceattribute %attr(0755,root,root) %{_unitdir}/%{name}-management.service
2626
%define _iptablesservice Requires: iptables-services
27-
%define _serverxmlname server7
27+
%define _serverxmlname server7
28+
%define _cloudstackmanagementconf install -D packaging/centos63/%{_os}/%{name}-management.conf ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-management.conf
29+
%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf

0 commit comments

Comments
 (0)