Fix neutron, nova and glance configuration

5 files changed, 23 insertions, 15 deletions

diff --git a/openstack/etc/neutron/dhcp_agent.ini b/openstack/etc/neutron/dhcp_agent.ini
index 72f5ed14..edb539bc 100644
--- a/openstack/etc/neutron/dhcp_agent.ini
+++ b/openstack/etc/neutron/dhcp_agent.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output)
-# debug = False
+debug = True
+verbose = True
  
 # The DHCP agent will resync its state with Neutron to recover from any
 # transient notification or rpc errors. The interval is number of
@@ -28,11 +29,11 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
  
 # The agent can use other DHCP drivers.  Dnsmasq is the simplest and requires
 # no additional setup of the DHCP server.
-# dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
+dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
  
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
 # iproute2 package that supports namespaces).
-# use_namespaces = True
+use_namespaces = True
  
 # The DHCP server can assist with providing metadata support on isolated
 # networks. Setting this value to True will cause the DHCP server to append
diff --git a/openstack/etc/neutron/l3_agent.ini b/openstack/etc/neutron/l3_agent.ini
index 6953b7cd..e29c88c4 100644
--- a/openstack/etc/neutron/l3_agent.ini
+++ b/openstack/etc/neutron/l3_agent.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output)
-# debug = False
+debug = True
+verbose = True
  
 # L3 requires that an interface driver be set. Choose the one that best
 # matches your plugin.
@@ -20,7 +21,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
  
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
 # iproute2 package that supports namespaces).
-# use_namespaces = True
+use_namespaces = True
  
 # If use_namespaces is set as False then the agent can only configure one router.
  
diff --git a/openstack/etc/neutron/metadata_agent.ini b/openstack/etc/neutron/metadata_agent.ini
index fb5ebffb..6a3d0102 100644
--- a/openstack/etc/neutron/metadata_agent.ini
+++ b/openstack/etc/neutron/metadata_agent.ini
@@ -1,23 +1,24 @@
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output)
-# debug = True
+debug = True
+verbose = True
  
 # The Neutron user information for accessing the Neutron API.
-auth_url = http://127.0.0.1:5000/v2.0
+auth_url = ##KEYSTONE_INTERNAL_URL##
 auth_region = RegionOne
 # Turn off verification of the certificate for ssl
 # auth_insecure = False
 # Certificate Authority public key (CA cert) file for ssl
 # auth_ca_cert =
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
+admin_tenant_name = service
+admin_user = ##NEUTRON_SERVICE_USER##
+admin_password = ##NEUTRON_SERVICE_PASSWORD##
  
 # Network service endpoint type to pull from the keystone catalog
 # endpoint_type = adminURL
  
 # IP address used by Nova metadata server
-# nova_metadata_ip = 127.0.0.1
+nova_metadata_ip = ##NOVA_HOST##
  
 # TCP Port used by Nova metadata server
 # nova_metadata_port = 8775
@@ -40,7 +41,7 @@ admin_password = %SERVICE_PASSWORD%
 # shared secret to prevent spoofing.  You may select any string for a secret,
 # but it must match here and in the configuration used by the Nova Metadata
 # Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret
-# metadata_proxy_shared_secret =
+metadata_proxy_shared_secret = ##METADATA_PROXY_SHARED_SECRET##
  
 # Location of Metadata Proxy UNIX domain socket
 # metadata_proxy_socket = $state_path/metadata_proxy
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf
index 1c66e080..e85cc9ab 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/etc/neutron/neutron.conf
@@ -246,7 +246,7 @@ notify_nova_on_port_data_changes = True
 nova_url = http://127.0.0.1:8774/v2
  
 # Name of nova region to use. Useful if keystone manages more than one region
-# nova_region_name =
+nova_region_name = ##NOVA_REGION##
  
 # Username for connection to nova in admin context
 nova_admin_username = ##NOVA_SERVICE_USER##
@@ -445,7 +445,7 @@ notification_driver=neutron.openstack.common.notifier.rpc_notifier
 # The messaging driver to use, defaults to rabbit. Other
 # drivers include qpid and zmq. (string value)
 rpc_backend=rabbit
- 
+
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the
 # transport_url option. (string value)
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
index c493a7bb..fb4d7a9f 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -67,7 +67,7 @@ tunnel_id_ranges = 1:1000
 # Example: vxlan_group = 239.1.1.1
 
 [securitygroup]
-firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 # Controls if neutron security group is enabled or not.
 # It should be false when you use nova security group.
 enable_security_group = True
@@ -77,4 +77,9 @@ enable_security_group = True
 enable_ipset = True
 
 [ovs]
+local_ip = 127.0.0.1
+enable_tunneling = True
 bridge_mappings=External:br-ex,Physnet1:br-eth1
+
+[agent]
+tunnel_types = gre