Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112187
Change subject: Add the use_neutron switch.
......................................................................
Add the use_neutron switch.
- Wrap neutron-specific code in nova roles and classes with use_neutron
- Turn neutron OFF in eqiad.
- Replace (optional) nova-network settings in havana nova.conf
Change-Id: I5ca96c867b6cc04cf9a0c03192d5b414647eb427
---
M manifests/role/nova.pp
M manifests/site.pp
M templates/openstack/havana/nova/nova.conf.erb
3 files changed, 34 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/112187/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index d13a2ef..89d1ccc 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -19,6 +19,7 @@
metadata_pass =>
$passwords::openstack::nova::nova_metadata_pass,
neutron_ldap_user_pass =>
$passwords::openstack::neutron::neutron_ldap_user_pass,
my_ip => $ipaddress_eth0,
+ use_neutron => $use_neutron,
ldap_base_dn => "dc=wikimedia,dc=org",
ldap_user_dn => "uid=novaadmin,ou=people,dc=wikimedia,dc=org",
ldap_user_pass =>
$passwords::openstack::nova::nova_ldap_user_pass,
@@ -374,8 +375,8 @@
include role::nova::wikiupdates,
role::nova::common
- # Havana uses neutron -- neutron roles configure their own interfaces.
- if ( $openstack_version != "havana" ) {
+ # Neutron roles configure their own interfaces.
+ if ( $use_neutron == false ) {
interface::tagged { $novaconfig["network_flat_interface"]:
base_interface =>
$novaconfig["network_flat_interface_name"],
vlan_id => $novaconfig["network_flat_interface_vlan"],
diff --git a/manifests/site.pp b/manifests/site.pp
index 64ffbba..a368b99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2532,6 +2532,7 @@
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
$openstack_version = "havana"
+ $use_neutron = false
include admins::labs
@@ -2542,7 +2543,11 @@
role::nova::controller,
role::salt::masters::labs,
role::deployment::salt_masters::labs,
- role::neutron::controller
+
+ if $use_neutron == true {
+ include role::neutron::controller
+ }
+
}
node "virt0.wikimedia.org" {
@@ -2597,21 +2602,29 @@
$openstack_version = "havana"
$ganglia_aggregator = true
- include standard,
- role::neutron::nethost,
- role::nova::api
+ $use_neutron = false
- include admins::labs
+ include standard,
+ role::nova::api,
+ admins::labs
+
+ if $use_neutron == true {
+ include role::neutron::nethost
+ }
}
node /virt1001.eqiad.wmnet/ {
$cluster = "virt"
$openstack_version = "havana"
+ $use_neutron = false
include standard,
- role::nova::compute,
- role::neutron::computenode
+ role::nova::compute
+
+ if $use_neutron == true {
+ include role::neutron::computenode
+ }
}
node /virt100[2-9].eqiad.wmnet/ {
diff --git a/templates/openstack/havana/nova/nova.conf.erb
b/templates/openstack/havana/nova/nova.conf.erb
index b86acc5..04fabe8 100644
--- a/templates/openstack/havana/nova/nova.conf.erb
+++ b/templates/openstack/havana/nova/nova.conf.erb
@@ -43,6 +43,7 @@
fixed_ip_disassociate_timeout=172800
iscsi_helper=tgtadm
+<% if <%= novaconfig["use_neutron"] %> -%>
# network/neutron settings
network_api_class = nova.network.neutronv2.api.API
neutron_url = http://<%= novaconfig['controller_hostname'] %>:9696
@@ -53,9 +54,18 @@
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
+<% else -%>
+flat_network_dhcp_start=<%= novaconfig["dhcp_start"] %>
+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"] %>
+<% end -%>
# novnc stuff
novncproxy_base_url=<%= novaconfig['controller_hostname'] %>:6080/vnc_auto.html
@@ -67,7 +77,6 @@
vncserver_listen=0.0.0.0
vncserver_proxyclient_address=<%= novaconfig['my_ip'] %>
-
# Settings for wikistatus, the plugin that updates OSM with instance status:
wiki_host=<%= instance_status_wiki_host %>
wiki_domain=<%= instance_status_wiki_domain %>
@@ -77,5 +86,3 @@
wiki_password=<%= instance_status_wiki_pass %>
wiki_instance_dns_domain=<%= instance_status_dns_domain %>
wiki_use_keystone=False
-
-
--
To view, visit https://gerrit.wikimedia.org/r/112187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ca96c867b6cc04cf9a0c03192d5b414647eb427
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
