FIXUPME: temporary nova configuration

1 files changed, 32 insertions, 16 deletions

diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index 3e9afed5..f0fb990c 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -1,6 +1,10 @@
 # Full list of options available at: http://wiki.openstack.org/NovaConfigOptions
 [DEFAULT]
 
+# LOG/STATE
+verbose=True
+logdir=/var/log/nova
+
 ### nova.availability_zones ###
 ###############################
 # availability_zone to show internal services under (string value)
@@ -88,7 +92,7 @@ enabled_apis=ec2,osapi_compute,metadata
 # Nova API extentions #
 #######################
 # osapi compute extension to load (multi valued)
-#osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions
+osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions
 
 # Specify list of extensions to load when using
 # osapi_compute_extension option with
@@ -100,13 +104,13 @@ enabled_apis=ec2,osapi_compute,metadata
 
 # S3 #
 # #  #
-#s3_host=$my_ip
+s3_host=$my_ip
 #s3_port=3333
 
 # EC2 API #
 # # # # # #
 #ec2_host="$my_ip"
-#ec2_dmz_host="$my_ip"
+ec2_dmz_host="$my_ip"
 #ec2_private_dns_show_ip=True
 #ec2_path="/services/Cloud"
 #ec2_port=8773
@@ -154,6 +158,7 @@ auth_strategy=keystone
 #############
 # SCHEDULER #
 #############
+compute_scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
 #scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
 
 ####################
@@ -190,23 +195,25 @@ rpc_backend = nova.openstack.common.rpc.impl_kombu
 ##########
 # GLANCE #
 ##########
-glance_host=##GLANCE_HOST##
-#glance_port=9292
-#glance_protocol=http
+host=##GLANCE_HOST##
+port=9292
+protocol=http
 
 # A list of the glance api servers available to nova. Prefix
 # with https:// for ssl-based glance api servers.
 # ([hostname|ip]:port) (list value)
-#glance_api_servers=$glance_host:$glance_port
-#glance_api_servers=192.168.0.1:9292
+api_servers=$glance_host:$glance_port
+#api_servers=127.0.0.1:9292
 
 # Allow to perform insecure SSL (https) requests to glance (boolean value)
-#glance_api_insecure=false
+#api_insecure=false
 
 # Cache glance images locally
 #cache_images=true
 # Number retries when downloading an image from glance (integer value)
-#glance_num_retries=0
+#num_retries=0
+
+#image_service=nova.image.glance.GlanceImageService
 
 ###############################
 # Type of network APIs to use #
@@ -237,21 +244,26 @@ firewall_driver=nova.virt.firewall.NoopFirewallDriver
 # NETWORK (linux net) #
 #######################
 #network_manager=nova.network.manager.VlanManager
+network_manager=nova.network.manager.FlatDHCPManager
 #force_dhcp_release=false
+force_dhcp_release=True
 #dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf
+dhcpbridge_flagfile=/etc/nova/nova.conf
 #dhcpbridge=$bindir/nova-dhcpbridge
 #dhcp_lease_time=120
 # Firewall driver (defaults to hypervisor specific iptables driver) (string value)
-#firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver
+firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver
 # Interface for public IP addresses (default: eth0) (string value)
 #public_interface=br-ext
+public_interface=eth0
 # vlans will bridge into this interface if set (default: <None>) (string value)
 # FlatDhcp will bridge into this interface if set (default: <None>) (string value)
 #vlan_interface=eth1
+vlan_interface=eth0
 # Bridge for simple network instances (default: <None>) (string value)
-#flat_network_bridge=br100
+flat_network_bridge=br100
 # FlatDhcp will bridge into this interface if set (default: <None>) (string value)
-#flat_interface=eth0
+flat_interface=eth0
 
 # set it to the /32 of your metadata server if you have just one
 # It is a cidr in case there are multiple services that you want
@@ -274,7 +286,7 @@ neutron_admin_tenant_name=admin
 neutron_admin_username=##NOVA_SERVICE_USER##
 neutron_admin_password=##NOVA_SERVICE_PASSWORD##
 # This is the URL of your Keystone server
-#neutron_admin_auth_url=http://127.0.0.1:35357/v2.0
+neutron_admin_auth_url=http://127.0.0.1:35357/v2.0
 
 # What's below is only needed for nova-compute.
 
@@ -304,7 +316,7 @@ vnc_enabled=True
 novncproxy_base_url=##NOVA_NOVNCPROXY_BASE_URL##
 # Change vncserver_proxyclient_address and vncserver_listen to match each compute host
 vncserver_proxyclient_address=##NOVA_HOST##
-vncserver_listen=0.0.0.0
+vncserver_listen=##NOVA_HOST##
 vnc_keymap="en-us"
 
 ######################################
@@ -352,7 +364,7 @@ vnc_keymap="en-us"
 # DATABASE #
 ############
 [database]
-connection=sqlite:////var/lib/nova/novadb
+connection=sqlite:////var/lib/nova/nova.sqlite
 
 
 #############
@@ -604,6 +616,10 @@ compute_driver=libvirt.LibvirtDriver
 instance_name_template=instance-%08x
 api_paste_config=/etc/nova/api-paste.ini
 
+# COMPUTE/APIS: if you have separate configs for separate services
+# # this flag is required for both nova-api and nova-compute
+allow_resize_to_same_host=True
+
 ############
 ## LIBVIRT #
 ############