Ryan Lane has submitted this change and it was merged.
Change subject: Move the ip into the role and below the bond
......................................................................
Move the ip into the role and below the bond
Change-Id: I4c2a0bf984b2741adcef09312d3d0bd464b21021
---
M manifests/role/nova.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 6b589db..32e163f 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -280,6 +280,8 @@
require role::nova::network::bonding
+ interface_ip { "openstack::network_service_public_dynamic_snat":
interface => "lo", address => $site ? { "pmtpa" => "208.80.153.192" } }
+
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 84e35aa..ec1a8fc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2512,7 +2512,6 @@
role::nova::network,
role::nova::api
- interface_ip { "openstack::network_service_public_dynamic_snat":
interface => "lo", address => "208.80.153.192" }
}
node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/52155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c2a0bf984b2741adcef09312d3d0bd464b21021
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
