Add config option for treating all config files as files
Change-Id: I9139f2489dc342c6f5f4a721c367485f1b28e463
This commit is contained in:
Kris Lindgren
parent
794d91f2cf
commit
bb71eb0e33
|
|
@ -184,6 +184,13 @@ def parse(previous_settings=None):
|
|||
help=("for virtualenv builds, make the virtualenv "
|
||||
"relocatable to a directory different from "
|
||||
"build directory"))
|
||||
build_group.add_option('-c', "--overwrite-configs",
|
||||
action="store_true",
|
||||
dest="overwrite_configs",
|
||||
default=False,
|
||||
help=("When packaging do you want rpm to mark config "
|
||||
"files with %config or treat them as files and "
|
||||
"overwrite them each time on rpm install"))
|
||||
parser.add_option_group(build_group)
|
||||
|
||||
# Extract only what we care about, these will be passed
|
||||
|
|
@ -202,6 +209,7 @@ def parse(previous_settings=None):
|
|||
values['verbose'] = options.verbose
|
||||
values['usr_only'] = options.usr_only
|
||||
values['tee_file'] = options.tee_file
|
||||
values['overwrite_configs'] = options.overwrite_configs
|
||||
if options.origins_patch_fn:
|
||||
with open(options.origins_patch_fn) as fp:
|
||||
values['origins_patch'] = json.load(fp)
|
||||
|
|
|
|||
|
|
@ -310,6 +310,8 @@ class YumDependencyHandler(base.DependencyHandler):
|
|||
rpmbuild_flags = "--rebuild"
|
||||
if self.opts.get("usr_only", False):
|
||||
rpmbuild_flags += " --define 'usr_only 1'"
|
||||
if self.opts.get("overwrite_configs", False):
|
||||
rpmbuild_flags += " --define 'overwrite_configs 1'"
|
||||
with sh.remove_before(self.rpmbuild_dir):
|
||||
self._create_rpmbuild_subdirs()
|
||||
# This is needed so that make correctly identifies the right
|
||||
|
|
@ -666,10 +668,6 @@ class YumDependencyHandler(base.DependencyHandler):
|
|||
params.update(self._make_spec_functors(parsed_version))
|
||||
content = utils.load_template(self.SPEC_TEMPLATE_DIR, template_name)[1]
|
||||
spec_filename = sh.joinpths(self.rpmbuild_dir, "SPECS", "%s.spec" % rpm_name)
|
||||
LOG.debug("Generating '%s' using template '%s' with params"
|
||||
" to fill in that template being:", spec_filename,
|
||||
template_name)
|
||||
utils.log_object(params, logger=LOG, level=logging.DEBUG)
|
||||
sh.write_file(spec_filename, utils.expand_template(content, params),
|
||||
tracewriter=self.tracewriter)
|
||||
return spec_filename
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
|
||||
%global os_version $version
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: novnc
|
||||
Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support
|
||||
Epoch: $epoch
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@
|
|||
%global daemon_prefix openstack-ceilometer
|
||||
%global os_version ${version}
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-ceilometer
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -438,15 +444,15 @@ exit 0
|
|||
%dir %{_sysconfdir}/ceilometer
|
||||
#if $older_than('2014.2')
|
||||
%attr(-, root, ceilometer) %{_datadir}/ceilometer/ceilometer-dist.conf
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/ceilometer.conf
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/policy.json
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/sources.json
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/pipeline.yaml
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/ceilometer.conf
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/policy.json
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/sources.json
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/pipeline.yaml
|
||||
#else
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/*
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/*
|
||||
#end if
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%configfile %{_sysconfdir}/logrotate.d/%{name}
|
||||
%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
|
||||
%dir %attr(0755, ceilometer, root) %{_localstatedir}/run/ceilometer
|
||||
|
||||
|
|
@ -661,7 +667,7 @@ fi
|
|||
|
||||
#if $newer_than_eq('2014.2')
|
||||
%files ipmi
|
||||
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters
|
||||
%configfile %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters
|
||||
%{_bindir}/ceilometer-agent-ipmi
|
||||
%{_bindir}/ceilometer-rootwrap
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-cinder
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -310,10 +316,10 @@ fi
|
|||
%endif
|
||||
|
||||
%dir %{_sysconfdir}/cinder
|
||||
%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
|
||||
%configfile %attr(-, root, cinder) %{_sysconfdir}/cinder/*
|
||||
%configfile %{_sysconfdir}/logrotate.d/openstack-cinder
|
||||
%configfile %{_sysconfdir}/sudoers.d/cinder
|
||||
%configfile %{_sysconfdir}/tgt/conf.d/cinder.conf
|
||||
|
||||
%dir %attr(0755, cinder, root) %{_localstatedir}/log/cinder
|
||||
%dir %attr(0755, cinder, root) %{_localstatedir}/run/cinder
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-glance
|
||||
Epoch: $epoch
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
@ -267,8 +273,8 @@ fi
|
|||
%{_unitdir}/*
|
||||
%endif
|
||||
%dir %{_sysconfdir}/glance
|
||||
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/*
|
||||
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/logrotate.d/openstack-glance
|
||||
%configfile %attr(-, root, glance) %{_sysconfdir}/glance/*
|
||||
%configfile %attr(-, root, glance) %{_sysconfdir}/logrotate.d/openstack-glance
|
||||
%dir %attr(0755, glance, nobody) %{_localstatedir}/lib/glance
|
||||
%dir %attr(0755, glance, nobody) %{_localstatedir}/lib/glance/images
|
||||
%dir %attr(0755, glance, nobody) %{_localstatedir}/log/glance
|
||||
|
|
|
|||
|
|
@ -9,6 +9,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-heat
|
||||
Summary: OpenStack Orchestration (heat)
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
@ -157,11 +163,11 @@ Components common to all OpenStack Heat services
|
|||
%dir %attr(0755,heat,root) %{_sysconfdir}/heat
|
||||
%dir %attr(0755,heat,root) /var/run/heat
|
||||
#if $older_than('2015.1')
|
||||
%config(noreplace) %attr(0640, root, heat) %{_sysconfdir}/heat/heat.conf
|
||||
%configfile %attr(0640, root, heat) %{_sysconfdir}/heat/heat.conf
|
||||
#end if
|
||||
%config(noreplace) %attr(0640, root, heat) %{_sysconfdir}/heat/api-paste.ini
|
||||
%config(noreplace) %attr(0640, root, heat) %{_sysconfdir}/heat/policy.json
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/heat
|
||||
%configfile %attr(0640, root, heat) %{_sysconfdir}/heat/api-paste.ini
|
||||
%configfile %attr(0640, root, heat) %{_sysconfdir}/heat/policy.json
|
||||
%configfile %{_sysconfdir}/logrotate.d/heat
|
||||
%endif
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@
|
|||
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-ironic
|
||||
Summary: OpenStack Baremetal Hypervisor API (ironic)
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
@ -130,18 +136,18 @@ Components common to all OpenStack Ironic services
|
|||
#end if
|
||||
|
||||
%attr(-,ironic,ironic) %{_sharedstatedir}/ironic
|
||||
%config(noreplace) %{_sharedstatedir}/ironic/pxe_config.template
|
||||
%configfile %{_sharedstatedir}/ironic/pxe_config.template
|
||||
%dir %attr(0755, ironic, ironic) %{_localstatedir}/log/ironic
|
||||
%dir %attr(0755, ironic, ironic) %{_localstatedir}/run/ironic
|
||||
|
||||
%config(noreplace) %attr(-,root,ironic) %{_sysconfdir}/ironic
|
||||
%config(noreplace) %attr(0640, root, ironic) %{_sysconfdir}/ironic/policy.json
|
||||
%config(noreplace) %attr(0640, root, ironic) %{_sysconfdir}/ironic/ironic.conf
|
||||
%configfile %attr(-,root,ironic) %{_sysconfdir}/ironic
|
||||
%configfile %attr(0640, root, ironic) %{_sysconfdir}/ironic/policy.json
|
||||
%configfile %attr(0640, root, ironic) %{_sysconfdir}/ironic/ironic.conf
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/ironic/rootwrap.conf
|
||||
%config(noreplace) %{_sysconfdir}/ironic/rootwrap.d/*
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/*
|
||||
%config(noreplace) %{_sysconfdir}/sudoers.d/ironic
|
||||
%configfile %{_sysconfdir}/ironic/rootwrap.conf
|
||||
%configfile %{_sysconfdir}/ironic/rootwrap.d/*
|
||||
%configfile %{_sysconfdir}/logrotate.d/*
|
||||
%configfile %{_sysconfdir}/sudoers.d/ironic
|
||||
|
||||
%pre common
|
||||
#raw
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-keystone
|
||||
Epoch: $epoch
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
@ -212,7 +218,7 @@ fi
|
|||
%{_usr}/bin/*
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %{_sysconfdir}/keystone
|
||||
%configfile %{_sysconfdir}/keystone
|
||||
%dir %attr(0755, keystone, nobody) %{_sharedstatedir}/keystone
|
||||
%dir %attr(0755, keystone, nobody) %{_localstatedir}/log/keystone
|
||||
%dir %attr(0755, keystone, nobody) %{_localstatedir}/run/keystone
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-%{servicename}
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -108,7 +114,7 @@ ln -s %{_sysconfdir}/neutron/fwaas_driver.ini %{buildroot}%{_datadir}/neutron/l3
|
|||
%license LICENSE
|
||||
%doc AUTHORS CONTRIBUTING.rst README.rst
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
|
||||
%{_datadir}/neutron/l3_agent/*.conf
|
||||
%endif
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-%{servicename}
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -171,9 +177,9 @@ fi
|
|||
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron_lbaas.conf
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/services_lbaas.conf
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron_lbaas.conf
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/services_lbaas.conf
|
||||
%dir %{_sysconfdir}/neutron/conf.d
|
||||
%dir %{_sysconfdir}/neutron/conf.d/%{servicename}-agent
|
||||
%dir %{_sysconfdir}/neutron/conf.d/%{servicename}v2-agent
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-%{python_name}
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -169,8 +175,8 @@ fi
|
|||
%{_datarootdir}/neutron/rootwrap/vpnaas.filters
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron_vpnaas.conf
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron_vpnaas.conf
|
||||
%dir %{_sysconfdir}/neutron/conf.d
|
||||
%dir %{_sysconfdir}/neutron/conf.d/neutron-vpn-agent
|
||||
%{_datadir}/neutron/l3_agent/*.conf
|
||||
|
|
|
|||
|
|
@ -18,6 +18,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-neutron
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -1090,14 +1096,14 @@ fi
|
|||
%endif
|
||||
%dir %{_sysconfdir}/neutron
|
||||
%{_sysconfdir}/neutron/release
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/*.ini
|
||||
#if $older_than('2015.1')
|
||||
%config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
|
||||
%configfile %{_sysconfdir}/neutron/rootwrap.conf
|
||||
%dir %{_sysconfdir}/neutron/plugins
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/*
|
||||
%config(noreplace) %{_sysconfdir}/sudoers.d/neutron
|
||||
%configfile %{_sysconfdir}/logrotate.d/*
|
||||
%configfile %{_sysconfdir}/sudoers.d/neutron
|
||||
%dir %attr(0755, neutron, neutron) %{_sharedstatedir}/neutron
|
||||
%dir %attr(0755, neutron, neutron) %{_localstatedir}/log/neutron
|
||||
%dir %attr(0755, neutron, neutron) %{_localstatedir}/lock/neutron
|
||||
|
|
@ -1177,9 +1183,9 @@ fi
|
|||
%dir %{_sysconfdir}/neutron/conf.d
|
||||
%dir %{_sysconfdir}/neutron/conf.d/common
|
||||
%dir %{_sysconfdir}/neutron/plugins
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
|
||||
%config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/*
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
|
||||
%configfile %{_sysconfdir}/neutron/rootwrap.conf
|
||||
%configfile %{_sysconfdir}/logrotate.d/*
|
||||
%{_sysconfdir}/sudoers.d/neutron
|
||||
%dir %attr(0755, neutron, neutron) %{_sharedstatedir}/neutron
|
||||
%dir %attr(0750, neutron, neutron) %{_localstatedir}/log/neutron
|
||||
|
|
@ -1207,7 +1213,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/bigswitch
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
|
||||
#if $newer_than_eq('2014.1.dev146.g79fbeb7')
|
||||
%doc %{_sysconfdir}/neutron/plugins/bigswitch/ssl/*
|
||||
#end if
|
||||
|
|
@ -1221,9 +1227,9 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/brocade
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/*.ini
|
||||
#if $newer_than_eq('2015.1')
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/vyatta/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/vyatta/*.ini
|
||||
#end if
|
||||
%endif
|
||||
|
||||
|
|
@ -1244,7 +1250,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/cisco
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/cisco/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/cisco/*.ini
|
||||
#if $older_than('2015.1')
|
||||
#if $newer_than('2014.2')
|
||||
%if ! (0%{?rhel} > 6)
|
||||
|
|
@ -1264,7 +1270,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/embrane
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/embrane/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/embrane/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1282,7 +1288,7 @@ fi
|
|||
%{_unitdir}/%{daemon_prefix}-hyperv-agent.service
|
||||
%endif
|
||||
%dir %{_sysconfdir}/neutron/plugins/hyperv
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/hyperv/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/hyperv/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1295,7 +1301,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/ibm
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ibm/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ibm/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1313,7 +1319,7 @@ fi
|
|||
%else
|
||||
%{_unitdir}/%{daemon_prefix}-linuxbridge-agent.service
|
||||
%endif
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/linuxbridge/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/linuxbridge/*.ini
|
||||
%endif
|
||||
|
||||
#if $newer_than('2014.2')
|
||||
|
|
@ -1322,7 +1328,7 @@ fi
|
|||
%{_bindir}/neutron-metering-agent
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini
|
||||
%if ! (0%{?rhel} > 6)
|
||||
%{_initrddir}/%{daemon_prefix}-metering-agent
|
||||
%else
|
||||
|
|
@ -1337,7 +1343,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/midonet
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/midonet/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/midonet/*.ini
|
||||
%endif
|
||||
|
||||
%files -n openstack-neutron-ml2
|
||||
|
|
@ -1347,7 +1353,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/ml2
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ml2/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ml2/*.ini
|
||||
%endif
|
||||
|
||||
#if $older_than('2015.1')
|
||||
|
|
@ -1370,7 +1376,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/mlnx
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
|
||||
#if $newer_than('2014.2')
|
||||
%if ! (0%{?rhel} > 6)
|
||||
%{_initrddir}/%{daemon_prefix}-mlnx-agent
|
||||
|
|
@ -1390,7 +1396,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/nicira
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1403,7 +1409,7 @@ fi
|
|||
#if $newer_than_eq('2014.1.1')
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/nuage
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1424,7 +1430,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/opencontrail
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/opencontrail/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/opencontrail/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1437,7 +1443,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/oneconvergence
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/oneconvergence/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/oneconvergence/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1461,7 +1467,7 @@ fi
|
|||
%{_unitdir}/%{daemon_prefix}-ovs-cleanup.service
|
||||
%endif
|
||||
%dir %{_sysconfdir}/neutron/plugins/openvswitch
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/openvswitch/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/openvswitch/*.ini
|
||||
%endif
|
||||
|
||||
#if $newer_than_eq('2015.1')
|
||||
|
|
@ -1471,7 +1477,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/ovsvapp
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ovsvapp/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ovsvapp/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1482,7 +1488,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/plumgrid
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/plumgrid/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/plumgrid/*.ini
|
||||
%endif
|
||||
|
||||
#if $older_than('2015.1')
|
||||
|
|
@ -1500,7 +1506,7 @@ fi
|
|||
%{_unitdir}/%{daemon_prefix}-ryu-agent.service
|
||||
%endif
|
||||
%dir %{_sysconfdir}/neutron/plugins/ryu
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1532,7 +1538,7 @@ fi
|
|||
%{_unitdir}/%{daemon_prefix}-nec-agent.service
|
||||
%endif
|
||||
%dir %{_sysconfdir}/neutron/plugins/nec
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nec/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nec/*.ini
|
||||
%endif
|
||||
|
||||
#if $newer_than_eq('2014.1.b1')
|
||||
|
|
@ -1550,9 +1556,9 @@ fi
|
|||
%dir %{_sysconfdir}/neutron/plugins/vmware
|
||||
#if $older_than('2014.2')
|
||||
%dir %{_sysconfdir}/neutron/plugins/nicira
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
|
||||
#end if
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
|
||||
%endif
|
||||
#end if
|
||||
|
||||
|
|
@ -1563,7 +1569,7 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/neutron/plugins/metaplugin
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini
|
||||
%endif
|
||||
|
||||
%if ! 0%{?no_tests}
|
||||
|
|
@ -1579,7 +1585,7 @@ fi
|
|||
%{_bindir}/neutron-vpn-agent
|
||||
%{_datarootdir}/neutron/rootwrap/vpnaas.filters
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
|
||||
%configfile %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
|
||||
%if ! (0%{?rhel} > 6)
|
||||
%{_initrddir}/%{daemon_prefix}-vpn-agent
|
||||
%else
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-nova
|
||||
Summary: OpenStack Compute (nova)
|
||||
|
|
@ -642,10 +647,10 @@ fi
|
|||
|
||||
%if ! 0%{?usr_only}
|
||||
%dir %{_sysconfdir}/nova
|
||||
%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
|
||||
%configfile %attr(-, root, nova) %{_sysconfdir}/nova/*
|
||||
%configfile %{_sysconfdir}/logrotate.d/openstack-nova
|
||||
%configfile %{_sysconfdir}/sudoers.d/nova
|
||||
%configfile %{_sysconfdir}/polkit-1/localauthority/50-local.d/50-nova.pkla
|
||||
|
||||
%dir %attr(0755, nova, root) %{_localstatedir}/log/nova
|
||||
%dir %attr(0755, nova, root) %{_localstatedir}/lock/nova
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: openstack-trove
|
||||
Epoch: $epoch
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
@ -245,7 +251,7 @@ fi
|
|||
%{_usr}/bin/*
|
||||
|
||||
%if ! 0%{?usr_only}
|
||||
%config(noreplace) %{_sysconfdir}/trove
|
||||
%configfile %{_sysconfdir}/trove
|
||||
%dir %attr(0755, trove, nobody) %{_sharedstatedir}/trove
|
||||
%dir %attr(0755, trove, nobody) %{_localstatedir}/log/trove
|
||||
%dir %attr(0755, trove, nobody) %{_localstatedir}/run/trove
|
||||
|
|
|
|||
|
|
@ -18,6 +18,12 @@
|
|||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: python-%{python_name}
|
||||
Summary: OpenStack ${clientname.title()} Client
|
||||
Version: %{os_version}$version_suffix
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@
|
|||
|
||||
%global with_compression 1
|
||||
|
||||
%if ! 0%{?overwrite_configs}
|
||||
%global configfile %config(noreplace)
|
||||
%else
|
||||
%global configfile %config
|
||||
%endif
|
||||
|
||||
Name: python-django-horizon
|
||||
Version: %{os_version}$version_suffix
|
||||
Release: $release%{?dist}
|
||||
|
|
@ -402,8 +408,8 @@ rm -rf %{buildroot}
|
|||
%if ! 0%{?usr_only}
|
||||
%{_sharedstatedir}/openstack-dashboard
|
||||
%dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
|
||||
%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings
|
||||
%configfile %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
|
||||
%configfile %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings
|
||||
%endif
|
||||
|
||||
%if ! 0%{?no_tests}
|
||||
|
|
|
|||
Loading…
Reference in New Issue