diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index c1f185d7c40..7306d1ffeb8 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -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-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 @@ -629,7 +628,6 @@ 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 diff --git a/packaging/centos63/default/macros.spec b/packaging/centos63/default/macros.spec index 0e6618765a5..f3c937cac37 100644 --- a/packaging/centos63/default/macros.spec +++ b/packaging/centos63/default/macros.spec @@ -24,6 +24,4 @@ %define _managementservice %{nil} %define _managementserviceattribute %{nil} %define _iptablesservice %{nil} -%define _serverxmlname server -%define _cloudstackmanagementconf %{nil} -%define _cloudstackmanagementconfattr %{nil} \ No newline at end of file +%define _serverxmlname server \ No newline at end of file diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/packaging/centos63/rhel7/cloudstack-management.conf deleted file mode 100644 index 881af1a0dfc..00000000000 --- a/packaging/centos63/rhel7/cloudstack-management.conf +++ /dev/null @@ -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 - \ No newline at end of file diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec index 13eaf8ebfe3..4b7109280ab 100644 --- a/packaging/centos63/rhel7/macros.spec +++ b/packaging/centos63/rhel7/macros.spec @@ -24,6 +24,4 @@ %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 -%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 +%define _serverxmlname server7 \ No newline at end of file