[openstack-nova/el6-havana] Add global config file to keep the default values

Nikola Dipanov ndipanov at fedoraproject.org
Tue Aug 27 09:15:47 UTC 2013


commit 939526a58f4ddeecdb99a1fd7aa85b7c34ba822e
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Thu Aug 8 10:03:27 2013 +0200

    Add global config file to keep the default values
    
    Ship a config file under /user/share to keep the default values.
    The file nova.conf is now documented an acts as an example config file
    that can be modified with user preferences.

 nova.conf => nova-dist.conf            |    0
 openstack-nova-api.init                |    2 +-
 openstack-nova-api.upstart             |    2 +-
 openstack-nova-cells.init              |    2 +-
 openstack-nova-cells.upstart           |    2 +-
 openstack-nova-cert.init               |    2 +-
 openstack-nova-cert.upstart            |    2 +-
 openstack-nova-compute.init            |    2 +-
 openstack-nova-compute.upstart         |    2 +-
 openstack-nova-conductor.init          |    2 +-
 openstack-nova-conductor.upstart       |    2 +-
 openstack-nova-console.init            |    2 +-
 openstack-nova-console.upstart         |    2 +-
 openstack-nova-consoleauth.init        |    2 +-
 openstack-nova-consoleauth.upstart     |    2 +-
 openstack-nova-direct-api.init         |    2 +-
 openstack-nova-metadata-api.init       |    2 +-
 openstack-nova-metadata-api.upstart    |    2 +-
 openstack-nova-network.init            |    2 +-
 openstack-nova-network.upstart         |    2 +-
 openstack-nova-novncproxy.upstart      |    2 +-
 openstack-nova-objectstore.init        |    2 +-
 openstack-nova-objectstore.upstart     |    2 +-
 openstack-nova-scheduler.init          |    2 +-
 openstack-nova-scheduler.upstart       |    2 +-
 openstack-nova-spicehtml5proxy.init    |    2 +-
 openstack-nova-spicehtml5proxy.upstart |    2 +-
 openstack-nova-xvpvncproxy.init        |    2 +-
 openstack-nova-xvpvncproxy.upstart     |    2 +-
 openstack-nova.spec                    |   57 ++++++++++++++++++++++++++++++--
 30 files changed, 82 insertions(+), 31 deletions(-)
---
diff --git a/nova.conf b/nova-dist.conf
similarity index 100%
rename from nova.conf
rename to nova-dist.conf
diff --git a/openstack-nova-api.init b/openstack-nova-api.init
index dd12bb6..ff6f525 100644
--- a/openstack-nova-api.init
+++ b/openstack-nova-api.init
@@ -39,7 +39,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-api.upstart b/openstack-nova-api.upstart
index 183e357..24274e0 100644
--- a/openstack-nova-api.upstart
+++ b/openstack-nova-api.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-api --config-file /etc/nova/nova.conf --logfile /var/log/nova/api.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-api --logfile /var/log/nova/api.log" nova
diff --git a/openstack-nova-cells.init b/openstack-nova-cells.init
index 236f404..83baf10 100644
--- a/openstack-nova-cells.init
+++ b/openstack-nova-cells.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-cells.upstart b/openstack-nova-cells.upstart
index d650c98..bb0bbdd 100644
--- a/openstack-nova-cells.upstart
+++ b/openstack-nova-cells.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-cells --config-file /etc/nova/nova.conf --logfile /var/log/nova/cells.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-cells --logfile /var/log/nova/cells.log" nova
diff --git a/openstack-nova-cert.init b/openstack-nova-cert.init
index 7ead60a..1ce65a8 100644
--- a/openstack-nova-cert.init
+++ b/openstack-nova-cert.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-cert.upstart b/openstack-nova-cert.upstart
index 6fd31f7..6480c76 100644
--- a/openstack-nova-cert.upstart
+++ b/openstack-nova-cert.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-cert --config-file /etc/nova/nova.conf --logfile /var/log/nova/cert.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-cert --logfile /var/log/nova/cert.log" nova
diff --git a/openstack-nova-compute.init b/openstack-nova-compute.init
index 8ee9c69..0e6adc7 100644
--- a/openstack-nova-compute.init
+++ b/openstack-nova-compute.init
@@ -47,7 +47,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-compute.upstart b/openstack-nova-compute.upstart
index 911532c..5ff3f06 100644
--- a/openstack-nova-compute.upstart
+++ b/openstack-nova-compute.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-compute --config-file /etc/nova/nova.conf --logfile /var/log/nova/compute.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-compute --logfile /var/log/nova/compute.log" nova
diff --git a/openstack-nova-conductor.init b/openstack-nova-conductor.init
index 82b38f1..34548e4 100644
--- a/openstack-nova-conductor.init
+++ b/openstack-nova-conductor.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-conductor.upstart b/openstack-nova-conductor.upstart
index 34d704d..bd2abb7 100644
--- a/openstack-nova-conductor.upstart
+++ b/openstack-nova-conductor.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-conductor --logfile /var/log/nova/conductor.log" nova
diff --git a/openstack-nova-console.init b/openstack-nova-console.init
index 50732ff..b21ae59 100644
--- a/openstack-nova-console.init
+++ b/openstack-nova-console.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-console.upstart b/openstack-nova-console.upstart
index b6b42a1..ebbc2b2 100644
--- a/openstack-nova-console.upstart
+++ b/openstack-nova-console.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-console --config-file /etc/nova/nova.conf --logfile /var/log/nova/console.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-console --logfile /var/log/nova/console.log" nova
diff --git a/openstack-nova-consoleauth.init b/openstack-nova-consoleauth.init
index 40398cb..a904a27 100644
--- a/openstack-nova-consoleauth.init
+++ b/openstack-nova-consoleauth.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-consoleauth.upstart b/openstack-nova-consoleauth.upstart
index 495b91e..6e27deb 100644
--- a/openstack-nova-consoleauth.upstart
+++ b/openstack-nova-consoleauth.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf --logfile /var/log/nova/consoleauth.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-consoleauth --logfile /var/log/nova/consoleauth.log" nova
diff --git a/openstack-nova-direct-api.init b/openstack-nova-direct-api.init
index 8fcd968..c708acc 100644
--- a/openstack-nova-direct-api.init
+++ b/openstack-nova-direct-api.init
@@ -39,7 +39,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-metadata-api.init b/openstack-nova-metadata-api.init
index 2c25f76..445a45f 100644
--- a/openstack-nova-metadata-api.init
+++ b/openstack-nova-metadata-api.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-metadata-api.upstart b/openstack-nova-metadata-api.upstart
index 9cdece4..62f953a 100644
--- a/openstack-nova-metadata-api.upstart
+++ b/openstack-nova-metadata-api.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-api-metadata --config-file /etc/nova/nova.conf --logfile /var/log/nova/metadata-api.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-api-metadata --logfile /var/log/nova/metadata-api.log" nova
diff --git a/openstack-nova-network.init b/openstack-nova-network.init
index bda4419..fe9ed45 100644
--- a/openstack-nova-network.init
+++ b/openstack-nova-network.init
@@ -45,7 +45,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-network.upstart b/openstack-nova-network.upstart
index 4ff9c40..1428bee 100644
--- a/openstack-nova-network.upstart
+++ b/openstack-nova-network.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-network --config-file /etc/nova/nova.conf --logfile /var/log/nova/network.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-network --logfile /var/log/nova/network.log" nova
diff --git a/openstack-nova-novncproxy.upstart b/openstack-nova-novncproxy.upstart
index d74adaa..2ea095d 100644
--- a/openstack-nova-novncproxy.upstart
+++ b/openstack-nova-novncproxy.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf --web /usr/share/novnc" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-novncproxy --web /usr/share/novnc" nova
diff --git a/openstack-nova-objectstore.init b/openstack-nova-objectstore.init
index cfe2054..fafedba 100644
--- a/openstack-nova-objectstore.init
+++ b/openstack-nova-objectstore.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-objectstore.upstart b/openstack-nova-objectstore.upstart
index ded9c99..322c1c5 100644
--- a/openstack-nova-objectstore.upstart
+++ b/openstack-nova-objectstore.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-objectstore --config-file /etc/nova/nova.conf --logfile /var/log/nova/objectstore.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-objectstore --logfile /var/log/nova/objectstore.log" nova
diff --git a/openstack-nova-scheduler.init b/openstack-nova-scheduler.init
index 072cfa9..dd45c5d 100644
--- a/openstack-nova-scheduler.init
+++ b/openstack-nova-scheduler.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-scheduler.upstart b/openstack-nova-scheduler.upstart
index 185cc24..75bef56 100644
--- a/openstack-nova-scheduler.upstart
+++ b/openstack-nova-scheduler.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-scheduler --config-file /etc/nova/nova.conf --logfile /var/log/nova/scheduler.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-scheduler --logfile /var/log/nova/scheduler.log" nova
diff --git a/openstack-nova-spicehtml5proxy.init b/openstack-nova-spicehtml5proxy.init
index b54570e..f5f0d28 100644
--- a/openstack-nova-spicehtml5proxy.init
+++ b/openstack-nova-spicehtml5proxy.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-spicehtml5proxy.upstart b/openstack-nova-spicehtml5proxy.upstart
index 983ae90..9f02da1 100644
--- a/openstack-nova-spicehtml5proxy.upstart
+++ b/openstack-nova-spicehtml5proxy.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-spicehtml5proxy --config-file /etc/nova/nova.conf --logfile /var/log/nova/spicehtml5proxy.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-spicehtml5proxy --logfile /var/log/nova/spicehtml5proxy.log" nova
diff --git a/openstack-nova-xvpvncproxy.init b/openstack-nova-xvpvncproxy.init
index 380397a..88affe4 100644
--- a/openstack-nova-xvpvncproxy.init
+++ b/openstack-nova-xvpvncproxy.init
@@ -31,7 +31,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user nova --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-nova-xvpvncproxy.upstart b/openstack-nova-xvpvncproxy.upstart
index 2f7a8df..a004b2a 100644
--- a/openstack-nova-xvpvncproxy.upstart
+++ b/openstack-nova-xvpvncproxy.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/nova-xvpvncproxy --config-file /etc/nova/nova.conf --logfile /var/log/nova/xvpvncproxy.log" nova
+exec su -s /bin/sh -c "exec /usr/bin/nova-xvpvncproxy --logfile /var/log/nova/xvpvncproxy.log" nova
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 606775b..5e61ade 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.2
-Release:          0.8.b2%{?dist}
+Release:          0.9.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -10,7 +10,7 @@ License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
 Source0:	  https://launchpad.net/nova/havana/havana-1/+download/nova-%{version}.b2.tar.gz
 
-Source1:          nova.conf
+Source1:          nova-dist.conf
 Source6:          nova.logrotate
 
 Source10:         openstack-nova-api.init
@@ -448,6 +448,52 @@ openstack-config --del etc/nova/api-paste.ini filter:authtoken auth_host
 openstack-config --del etc/nova/api-paste.ini filter:authtoken auth_port
 openstack-config --del etc/nova/api-paste.ini filter:authtoken auth_protocol
 openstack-config --del etc/nova/api-paste.ini filter:authtoken signing_dir
+openstack-config --del etc/nova/api-paste.ini filter:authtoken auth_version
+
+
+echo '
+#
+# Options to be passed to keystoneclient.auth_token middleware
+# NOTE: These options are not defined in nova but in keystoneclient
+#
+[keystone_authtoken]
+
+# the name of the admin tenant (string value)
+#admin_tenant_name=
+
+# the keystone admin username (string value)
+#admin_user=
+
+# the keystone admin password (string value)
+#admin_password=
+
+# the keystone host (string value)
+#auth_host=
+
+# the keystone port (integer value)
+#auth_port=
+
+# protocol to be used for auth requests http/https (string value)
+#auth_protocol=
+
+# Workaround for https://bugs.launchpad.net/nova/+bug/1154809
+#auth_version=
+
+# signing_dir is configurable, but the default behavior of the authtoken
+# middleware should be sufficient.  It will create a temporary directory
+# in the home directory for the user the nova process is running as.
+#signing_dir=/var/lib/nova/keystone-signing
+' >> etc/nova/nova.conf.sample
+
+# Programmatically update defaults in sample config
+# which is installed at /etc/nova/nova.conf
+# TODO: Make this more robust
+# Note it only edits the first occurance, so assumes a section ordering in sample
+# and also doesn't support multi-valued variables like dhcpbridge_flagfile.
+while read name eq value; do
+  test "$name" && test "$value" || continue
+  sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/nova/nova.conf.sample
+done < %{SOURCE1}
 
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
@@ -493,7 +539,8 @@ touch %{buildroot}%{_sharedstatedir}/nova/CA/private/cakey.pem
 
 # Install config files
 install -d -m 755 %{buildroot}%{_sysconfdir}/nova
-install -p -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/nova/nova.conf
+install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/nova/nova-dist.conf
+install -p -D -m 640 etc/nova/nova.conf.sample  %{buildroot}%{_sysconfdir}/nova/nova.conf
 install -p -D -m 640 etc/nova/rootwrap.conf %{buildroot}%{_sysconfdir}/nova/rootwrap.conf
 install -p -D -m 640 etc/nova/api-paste.ini %{buildroot}%{_sysconfdir}/nova/api-paste.ini
 install -p -D -m 640 etc/nova/policy.json %{buildroot}%{_sysconfdir}/nova/policy.json
@@ -753,6 +800,7 @@ fi
 %doc LICENSE
 %dir %{_sysconfdir}/nova
 %{_sysconfdir}/nova/release
+%attr(-, root, nova) %{_datadir}/nova/nova-dist.conf
 %config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/nova.conf
 %config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/api-paste.ini
 %config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/rootwrap.conf
@@ -874,6 +922,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 07 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.9.b2
+- Create a nova-dist.conf file with default values under /usr/share
+
 * Sun Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b2
 - Update to Havana milestone 2
 


More information about the scm-commits mailing list