Repository: cloudstack Updated Branches: refs/heads/master 67ff7dac8 -> e8f1c5921
CLOUDSTACK-7671: Management server restart failed after reboot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8f1c592 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8f1c592 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8f1c592 Branch: refs/heads/master Commit: e8f1c592120707ac214d535a6637fa7dc5826289 Parents: 67ff7da Author: Damodar <[email protected]> Authored: Mon Oct 6 11:53:20 2014 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue Oct 7 15:01:40 2014 +0530 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 2 ++ packaging/centos63/default/macros.spec | 4 +++- .../centos63/rhel7/cloudstack-management.conf | 18 ++++++++++++++++++ packaging/centos63/rhel7/macros.spec | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f1c592/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 7306d1f..c1f185d 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -273,6 +273,7 @@ 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-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 +%{_cloudstackmanagementconf} 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 @@ -628,6 +629,7 @@ fi %{_defaultdocdir}/%{name}-management-%{version}/LICENSE %{_defaultdocdir}/%{name}-management-%{version}/NOTICE %attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out +%{_cloudstackmanagementconfattr} %files agent %attr(0755,root,root) %{_bindir}/%{name}-setup-agent http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f1c592/packaging/centos63/default/macros.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/default/macros.spec b/packaging/centos63/default/macros.spec index f3c937c..0e66187 100644 --- a/packaging/centos63/default/macros.spec +++ b/packaging/centos63/default/macros.spec @@ -24,4 +24,6 @@ %define _managementservice %{nil} %define _managementserviceattribute %{nil} %define _iptablesservice %{nil} -%define _serverxmlname server \ No newline at end of file +%define _serverxmlname server +%define _cloudstackmanagementconf %{nil} +%define _cloudstackmanagementconfattr %{nil} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f1c592/packaging/centos63/rhel7/cloudstack-management.conf ---------------------------------------------------------------------- diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/packaging/centos63/rhel7/cloudstack-management.conf new file mode 100644 index 0000000..881af1a --- /dev/null +++ b/packaging/centos63/rhel7/cloudstack-management.conf @@ -0,0 +1,18 @@ +# 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 - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f1c592/packaging/centos63/rhel7/macros.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec index 4b71092..13eaf8e 100644 --- a/packaging/centos63/rhel7/macros.spec +++ b/packaging/centos63/rhel7/macros.spec @@ -24,4 +24,6 @@ %define _managementservice install -D packaging/centos63/%{_os}/cloud-management.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-management.service %define _managementserviceattribute %attr(0755,root,root) %{_unitdir}/%{name}-management.service %define _iptablesservice Requires: iptables-services -%define _serverxmlname server7 \ No newline at end of file +%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 \ No newline at end of file
