diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-11-11 15:25:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-11-11 15:25:11 +0000 |
| commit | 9b2446c88d73494322987423d5ffa88a5b2a5413 (patch) | |
| tree | dfc283a1496537963820481fd1b1f35d82d2b86b /nova-compute-config.yaml | |
| parent | 897c8b8aa9295b0214f35bd08ac42416078904f5 (diff) | |
| parent | 23d85de69b7921e76dce7ce8080eefaf06b094ff (diff) | |
Merge "Enable Neutron DVR support in TripleO installation"
Diffstat (limited to 'nova-compute-config.yaml')
| -rw-r--r-- | nova-compute-config.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 63685df6..8ba778bc 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -34,7 +34,12 @@ resources: debug: {get_param: Debug} flat-networks: {get_input: neutron_flat_networks} host: {get_input: neutron_host} + router_distributed: {get_input: neutron_router_distributed} + agent_mode: {get_input: neutron_agent_mode} ovs_db: {get_input: neutron_dsn} + metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} + mechanism_drivers: {get_input: neutron_mechanism_drivers} + allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover} ovs: local_ip: {get_input: neutron_local_ip} tenant_network_type: {get_input: neutron_tenant_network_type} @@ -44,6 +49,7 @@ resources: enable_tunneling: {get_input: neutron_enable_tunneling} physical_bridge: {get_input: neutron_physical_bridge} public_interface: {get_input: neutron_public_interface} + public_interface_raw_device: {get_input: neutron_public_interface_raw_device} service-password: {get_input: neutron_password} admin-password: {get_input: admin_password} rabbit: |