x/anvil
Code Issues Proposed changes

Collect all nova/cinder configuration files

Browse Source 
Instead of selecting just specific nova/cinder configuration
files just include all the configuration files instead.

This helps avoid the problem where other newer config
files are needed or old ones disappear (nova.conf.sample
no longer exists).

Change-Id: If3c37ef4b33d5f725a1798881cb55f4513e0f560
This commit is contained in:
Joshua Harlow
2014-03-27 15:44:53 -07:00
parent 4ea96a0572
commit 96ee6cf2f4
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
conf/templates/packaging/specs/openstack-cinder.spec
View File

@@ -187,10 +187,12 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/cinder
install -d -m 755 %{buildroot}%{_sysconfdir}/cinder
install -d -m 755 %{buildroot}%{_sysconfdir}/cinder/volumes
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt/conf.d/cinder.conf
install -p -D -m 640 etc/cinder/cinder.conf.sample %{buildroot}%{_sysconfdir}/cinder/
install -p -D -m 640 etc/cinder/rootwrap.conf %{buildroot}%{_sysconfdir}/cinder/
install -p -D -m 640 etc/cinder/api-paste.ini %{buildroot}%{_sysconfdir}/cinder/
install -p -D -m 640 etc/cinder/policy.json %{buildroot}%{_sysconfdir}/cinder/
install -d -m 755 %{buildroot}%{_sysconfdir}/cinder
for i in etc/cinder/*; do
if [ -f $i ] ; then
install -p -D -m 640 $i %{buildroot}%{_sysconfdir}/cinder/
fi
done
# Install initscripts for services
install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/%{daemon_prefix}-api
@@ -261,10 +263,7 @@ fi
%{_initrddir}/*
%dir %{_sysconfdir}/cinder
%config(noreplace) %attr(-, root, cinder) %{_sysconfdir}/cinder/cinder.conf.sample
%config(noreplace) %attr(-, root, cinder) %{_sysconfdir}/cinder/api-paste.ini
%config(noreplace) %attr(-, root, cinder) %{_sysconfdir}/cinder/rootwrap.conf
%config(noreplace) %attr(-, root, cinder) %{_sysconfdir}/cinder/policy.json
%config(noreplace) %attr(-, root, cinder) %{_sysconfdir}/cinder/*
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-cinder
%config(noreplace) %{_sysconfdir}/sudoers.d/cinder
%config(noreplace) %{_sysconfdir}/tgt/conf.d/cinder.conf

16
conf/templates/packaging/specs/openstack-nova.spec
View File

@@ -414,11 +414,11 @@ find %{buildroot}%{_sharedstatedir}/nova/CA -name .placeholder -delete
# Install config files
install -d -m 755 %{buildroot}%{_sysconfdir}/nova
install -p -D -m 640 etc/nova/api-paste.ini %{buildroot}%{_sysconfdir}/nova/
install -p -D -m 640 etc/nova/policy.json %{buildroot}%{_sysconfdir}/nova/
install -p -D -m 640 etc/nova/rootwrap.conf %{buildroot}%{_sysconfdir}/nova/
install -p -D -m 640 etc/nova/nova.conf.sample %{buildroot}%{_sysconfdir}/nova/
install -p -D -m 640 etc/nova/logging_sample.conf %{buildroot}%{_sysconfdir}/nova/
for i in etc/nova/*; do
if [ -f $i ] ; then
install -p -D -m 640 $i %{buildroot}%{_sysconfdir}/nova/
fi
done
# Install initscripts for Nova services
install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/%{daemon_prefix}-api
@@ -549,11 +549,7 @@ fi
%if ! 0%{?usr_only}
%dir %{_sysconfdir}/nova
%attr(-, root, nova) %{_sysconfdir}/nova/nova.conf.sample
%attr(-, root, nova) %{_sysconfdir}/nova/logging_sample.conf
%config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/rootwrap.conf
%config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/api-paste.ini
%config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/policy.json
%config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/*
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-nova
%config(noreplace) %{_sysconfdir}/sudoers.d/nova
%config(noreplace) %{_sysconfdir}/polkit-1/localauthority/50-local.d/50-nova.pkla