Ryan Lane has submitted this change and it was merged.
Change subject: Configure network node differently
......................................................................
Configure network node differently
The flat device for the network node is different from the compute
nodes. It uses a bonded device, rather than just using eth1.
Change-Id: Ia7fb66a18e4049a1728d9b206616cc04cf844f2e
---
M manifests/role/nova.pp
M manifests/role/puppet.pp
M templates/openstack/essex/nova/nova.conf.erb
3 files changed, 32 insertions(+), 19 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1c65167..963f15c 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -26,7 +26,7 @@
}
}
-class role::nova::config::pmtpa inherits role::nova::config {
+class role::nova::config::pmtpa($customconfig={}) inherits role::nova::config {
include role::keystone::config::pmtpa
$keystoneconfig = $role::keystone::config::pmtpa::keystoneconfig
@@ -99,10 +99,10 @@
keystone_auth_protocol => $keystoneconfig["auth_protocol"],
keystone_auth_port => $keystoneconfig["auth_port"],
}
- $novaconfig = merge( $pmtpanovaconfig, $commonnovaconfig )
+ $novaconfig = merge( $pmtpanovaconfig, $commonnovaconfig, $customconfig
)
}
-class role::nova::config::eqiad inherits role::nova::config {
+class role::nova::config::eqiad($customconfig={}) inherits role::nova::config {
include role::keystone::config::eqiad
$keystoneconfig = $role::keystone::config::eqiad::keystoneconfig
@@ -174,12 +174,12 @@
keystone_auth_protocol => $keystoneconfig["auth_protocol"],
keystone_auth_port => $keystoneconfig["auth_port"],
}
- $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig, $customconfig
)
}
class role::nova::common {
- include role::nova::config::pmtpa,
- role::nova::config::eqiad
+ class { "role::nova::config::pmtpa": }
+ class { "role::nova::config::eqiad": }
$novaconfig = $site ? {
"pmtpa" => $role::nova::config::pmtpa::novaconfig,
@@ -202,9 +202,9 @@
}
class role::nova::controller {
- include role::nova::config::pmtpa,
- role::nova::config::eqiad,
- role::keystone::config::pmtpa,
+ class { "role::nova::config::pmtpa": }
+ class { "role::nova::config::eqiad": }
+ include role::keystone::config::pmtpa,
role::keystone::config::eqiad,
role::glance::config::pmtpa,
role::glance::config::eqiad
@@ -251,8 +251,8 @@
}
class role::nova::api {
- include role::nova::config::pmtpa,
- role::nova::config::eqiad
+ class { "role::nova::config::pmtpa": }
+ class { "role::nova::config::eqiad": }
include role::nova::common
@@ -268,8 +268,19 @@
}
class role::nova::network {
- include role::nova::config::pmtpa,
- role::nova::config::eqiad
+ class { "role::nova::config::pmtpa":
+ customconfig => {
+ network_flat_interface => $realm ? {
+ "production" => "bond1.103",
+ "labs" => "eth0.103",
+ },
+ network_flat_interface_name => $realm ? {
+ "production" => "bond1",
+ "labs" => "eth0",
+ },
+ }
+ }
+ class { "role::nova::config::eqiad": }
include role::nova::common
@@ -319,9 +330,10 @@
}
class role::nova::compute {
- include role::nova::config::pmtpa,
- role::nova::config::eqiad,
- role::nova::wikiupdates,
+ class { "role::nova::config::pmtpa": }
+ class { "role::nova::config::eqiad": }
+
+ include role::nova::wikiupdates,
role::nova::common
$novaconfig = $site ? {
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index 254e0fb..6b98b43 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -1,7 +1,7 @@
class role::puppet::server::labs {
- include role::ldap::config::labs,
- role::nova::config::pmtpa,
- role::nova::config::eqiad
+ include role::ldap::config::labs
+ class { "role::nova::config::pmtpa": }
+ class { "role::nova::config::eqiad": }
$novaconfig = $site ? {
"pmtpa" => $role::nova::config::pmtpa::novaconfig,
diff --git a/templates/openstack/essex/nova/nova.conf.erb
b/templates/openstack/essex/nova/nova.conf.erb
index 91e2586..156c6fb 100644
--- a/templates/openstack/essex/nova/nova.conf.erb
+++ b/templates/openstack/essex/nova/nova.conf.erb
@@ -42,6 +42,7 @@
#use_ipv6=True
allow_same_net_traffic=False
live_migration_uri=<%= novaconfig["live_migration_uri"] %>
+libvirt_use_virtio_for_bridges=True
# Settings for wikistatus, the add-on that updates OSM with instance status:
notification_driver=nova.notifier.list_notifier
--
To view, visit https://gerrit.wikimedia.org/r/52180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7fb66a18e4049a1728d9b206616cc04cf844f2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
