Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/111785
Change subject: switch nova.conf to use neutron. ...................................................................... switch nova.conf to use neutron. First patch of many, no doubt. Change-Id: I31311aa97b613673b2361576d6d8748809216c77 --- M templates/openstack/havana/nova/nova.conf.erb 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/111785/1 diff --git a/templates/openstack/havana/nova/nova.conf.erb b/templates/openstack/havana/nova/nova.conf.erb index 232fe5a..3e6d6ec 100644 --- a/templates/openstack/havana/nova/nova.conf.erb +++ b/templates/openstack/havana/nova/nova.conf.erb @@ -25,15 +25,7 @@ libvirt_type=<%= novaconfig["libvirt_type"] %> dhcpbridge_flagfile=/etc/nova/nova.conf dhcpbridge=/usr/bin/nova-dhcpbridge -flat_network_dhcp_start=<%= novaconfig["dhcp_start"] %> dhcp_domain=<%= novaconfig["dhcp_domain"] %> -network_manager=nova.network.manager.FlatDHCPManager -flat_interface=<%= novaconfig["network_flat_interface"] %> -flat_injected=False -flat_network_bridge=<%= novaconfig["flat_network_bridge"] %> -fixed_range=<%= novaconfig["fixed_range"] %> -public_interface=<%= novaconfig["network_public_interface"] %> -routing_source_ip=<%= novaconfig["network_public_ip"] %> node_availability_zone=<%= novaconfig["zone"] %> zone_name=<%= novaconfig["zone"] %> quota_floating_ips=<%= novaconfig["quota_floating_ips"] %> @@ -51,6 +43,15 @@ fixed_ip_disassociate_timeout=172800 iscsi_helper=tgtadm +# network/neutron settings +network_api_class = nova.network.neutronv2.api.API +neutron_url = http://<%= novaconfig['controller_hostname'] %>:9696 +neutron_auth_strategy = keystone +neutron_admin_token = <%= novaconfig['keystone_admin_token'] %> +neutron_admin_auth_url = http://<%= novaconfig['controller_hostname'] %>:35357/v2.0 +linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver +firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver + neutron_metadata_proxy_shared_secret = <%= novaconfig["metadata_pass"] %> service_neutron_metadata_proxy = true -- To view, visit https://gerrit.wikimedia.org/r/111785 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31311aa97b613673b2361576d6d8748809216c77 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
