[openstack-nova] switch to new ini config format supported in Essex
Pádraig Brady
pbrady at fedoraproject.org
Thu Feb 23 15:52:42 UTC 2012
commit 8e2e091558799cc088893df4bf83808c63502975
Author: Pádraig Brady <P at draigBrady.com>
Date: Thu Feb 23 15:37:51 2012 +0000
switch to new ini config format supported in Essex
Note '--flagfile /dev/null' is specified here to
work around an issue with that being added by default
nova.conf | 35 +++++++++++++++--------------
openstack-nova-ajax-console-proxy.service | 2 +-
openstack-nova-api.service | 2 +-
openstack-nova-cert.service | 2 +-
openstack-nova-compute.service | 2 +-
openstack-nova-direct-api.service | 2 +-
openstack-nova-network.service | 2 +-
openstack-nova-objectstore.service | 2 +-
openstack-nova-scheduler.service | 2 +-
openstack-nova-vncproxy.service | 2 +-
openstack-nova-volume.service | 2 +-
openstack-nova.spec | 1 +
12 files changed, 29 insertions(+), 27 deletions(-)
---
diff --git a/nova.conf b/nova.conf
index 7015fb8..a1b4cf3 100644
--- a/nova.conf
+++ b/nova.conf
@@ -1,17 +1,18 @@
---logdir=/var/log/nova
---state_path=/var/lib/nova
---lock_path=/var/lib/nova/tmp
---dhcpbridge=/usr/bin/nova-dhcpbridge
---dhcpbridge_flagfile=/etc/nova/nova.conf
---force_dhcp_release=True
---injected_network_template=/usr/share/nova/interfaces.template
---libvirt_xml_template=/usr/share/nova/libvirt.xml.template
---vpn_client_template=/usr/share/nova/client.ovpn.template
---credentials_template=/usr/share/nova/novarc.template
---network_manager=nova.network.manager.FlatDHCPManager
---iscsi_helper=tgtadm
---sql_connection=mysql://nova:nova@localhost/nova
---connection_type=libvirt
---firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver
---rpc_backend=nova.rpc.impl_qpid
---root_helper=sudo nova-rootwrap
+[DEFAULT]
+logdir = /var/log/nova
+state_path = /var/lib/nova
+lock_path = /var/lib/nova/tmp
+dhcpbridge = /usr/bin/nova-dhcpbridge
+dhcpbridge_flagfile = /etc/nova/nova.conf
+force_dhcp_release = True
+injected_network_template = /usr/share/nova/interfaces.template
+libvirt_xml_template = /usr/share/nova/libvirt.xml.template
+vpn_client_template = /usr/share/nova/client.ovpn.template
+credentials_template = /usr/share/nova/novarc.template
+network_manager = nova.network.manager.FlatDHCPManager
+iscsi_helper = tgtadm
+sql_connection = mysql://nova:nova@localhost/nova
+connection_type = libvirt
+firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
+rpc_backend = nova.rpc.impl_qpid
+root_helper = sudo nova-rootwrap
diff --git a/openstack-nova-ajax-console-proxy.service b/openstack-nova-ajax-console-proxy.service
index 2d6af6a..ea6f55c 100644
--- a/openstack-nova-ajax-console-proxy.service
+++ b/openstack-nova-ajax-console-proxy.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-ajax-console-proxy --flagfile /etc/nova/nova.conf --logfile /var/log/nova/ajax-console-proxy.log
+ExecStart=/usr/bin/nova-ajax-console-proxy --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/ajax-console-proxy.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-api.service b/openstack-nova-api.service
index f487e18..46f38ce 100644
--- a/openstack-nova-api.service
+++ b/openstack-nova-api.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-api --flagfile /etc/nova/nova.conf --logfile /var/log/nova/api.log
+ExecStart=/usr/bin/nova-api --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/api.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-cert.service b/openstack-nova-cert.service
index d2b5e76..2d7bcdd 100644
--- a/openstack-nova-cert.service
+++ b/openstack-nova-cert.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-cert --flagfile /etc/nova/nova.conf --logfile /var/log/nova/cert.log
+ExecStart=/usr/bin/nova-cert --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/cert.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-compute.service b/openstack-nova-compute.service
index c1f3b07..1a29743 100644
--- a/openstack-nova-compute.service
+++ b/openstack-nova-compute.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-compute --flagfile /etc/nova/nova.conf --logfile /var/log/nova/compute.log
+ExecStart=/usr/bin/nova-compute --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/compute.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-direct-api.service b/openstack-nova-direct-api.service
index cc8d5aa..93d24f0 100644
--- a/openstack-nova-direct-api.service
+++ b/openstack-nova-direct-api.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-direct-api --flagfile /etc/nova/nova.conf --logfile /var/log/nova/direct-api.log
+ExecStart=/usr/bin/nova-direct-api --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/direct-api.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-network.service b/openstack-nova-network.service
index 29c5ef1..90f5efd 100644
--- a/openstack-nova-network.service
+++ b/openstack-nova-network.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-network --flagfile /etc/nova/nova.conf --logfile /var/log/nova/network.log
+ExecStart=/usr/bin/nova-network --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/network.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-objectstore.service b/openstack-nova-objectstore.service
index 160ba85..c69ba4b 100644
--- a/openstack-nova-objectstore.service
+++ b/openstack-nova-objectstore.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-objectstore --flagfile /etc/nova/nova.conf --logfile /var/log/nova/objectstore.log
+ExecStart=/usr/bin/nova-objectstore --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/objectstore.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-scheduler.service b/openstack-nova-scheduler.service
index 2be91f8..6edb87d 100644
--- a/openstack-nova-scheduler.service
+++ b/openstack-nova-scheduler.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-scheduler --flagfile /etc/nova/nova.conf --logfile /var/log/nova/scheduler.log
+ExecStart=/usr/bin/nova-scheduler --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/scheduler.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-vncproxy.service b/openstack-nova-vncproxy.service
index 95058cc..c6e5905 100644
--- a/openstack-nova-vncproxy.service
+++ b/openstack-nova-vncproxy.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-vncproxy --flagfile /etc/nova/nova.conf --logfile /var/log/nova/vncproxy.log
+ExecStart=/usr/bin/nova-vncproxy --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/vncproxy.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova-volume.service b/openstack-nova-volume.service
index e309b0e..254d974 100644
--- a/openstack-nova-volume.service
+++ b/openstack-nova-volume.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=nova
-ExecStart=/usr/bin/nova-volume --flagfile /etc/nova/nova.conf --logfile /var/log/nova/volume.log
+ExecStart=/usr/bin/nova-volume --flagfile /dev/null --config-file /etc/nova/nova.conf --logfile /var/log/nova/volume.log
[Install]
WantedBy=multi-user.target
diff --git a/openstack-nova.spec b/openstack-nova.spec
index ba0e5ce..1d80e06 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -364,6 +364,7 @@ fi
- explicitly select the libvirt firewall driver in default nova.conf.
- Add dependency on python-iso8601.
- Enable --force_dhcp_release.
+- Switch to the new ini format config file.
* Mon Feb 13 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.4.e3
- Support --force_dhcp_release (#788485)
More information about the scm-commits
mailing list