Andrew Bogott has submitted this change and it was merged.
Change subject: Configure bridges and ports for OVS
......................................................................
Configure bridges and ports for OVS
Change-Id: I4bbf3e646ce82439cf5e500b227c2246ae4a7030
---
M manifests/openstack.pp
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 74a345e..fe95dc3 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -513,6 +513,27 @@
require => Package['neutron-server'],
}
+ exec { 'create_br-int':
+ unless => "ovs-vsctl br-exists br-int",
+ command => "ovs-vsctl add-br br-int",
+ require => Service['openvswitch-switch'],
+ }
+
+ exec { 'create_br-ex':
+ unless => "ovs-vsctl br-exists br-ex",
+ command => "ovs-vsctl add-br br-ex",
+ require => Service['openvswitch-switch'],
+ }
+
+ $external_interface = 'eth1'
+
+ exec { 'add-port':
+ unless => "ovs-vsctl list-ports br-ex | grep
${external_interface}",
+ command => "ovs-vsctl add-port br-ex ${external_interface}",
+ require => Service['openvswitch-switch'],
+ after => Exec['create_br-ex'],
+ }
+
file { '/etc/neutron/neutron.conf':
content =>
template("openstack/${$openstack_version}/neutron/neutron.conf.erb"),
owner => 'neutron',
--
To view, visit https://gerrit.wikimedia.org/r/110918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bbf3e646ce82439cf5e500b227c2246ae4a7030
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
