Add configuration option for neutron external network

config.yaml

@@ -79,6 +79,10 @@ options:
       Use quantum for security group management.
       .
       Only supported for >= grizzly.
+  neutron-external-network:
+    type: string
+    default: ext_net
+    description: Name of the external network for floating IP addresses provided by Neutron.
   config-flags:
     default: None
     type: string

hooks/nova_cc_context.py

@@ -136,6 +136,11 @@ class NeutronCCContext(context.NeutronContext):
         # required agents.
         return
 
+    def __call__(self):
+        ctxt = super(NeutronCCContext, self).__call__()
+        ctxt['external_network'] = config('neutron-external-network')
+        return ctxt
+
 
 class IdentityServiceContext(context.IdentityServiceContext):
     def __call__(self):

templates/folsom/nova.conf

@@ -52,6 +52,9 @@ libvirt_user_virtio_for_bridges =  True
 security_group_api = {{ network_manager }}
 nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
 {% endif -%}
 
 {% if network_manager_config -%}