Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376433 )
Change subject: openstack: pass in network_public_ip for nova network
......................................................................
openstack: pass in network_public_ip for nova network
Bug: T171494
Change-Id: Ib83532ae2a38b817ec3bcf87ea085679f26f9af8
---
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
M modules/profile/manifests/openstack/main/nova/network/service.pp
3 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/376433/1
diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 233c4bb..31a25d5 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -8,7 +8,7 @@
$network_flat_interface =
hiera('profile::openstack::base::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::base::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::base::nova::network_flat_interface_vlan'),
- $network_public_ip =
hiera('profile::openstack::labtestn::nova::network_public_ip'),
+ $network_public_ip =
hiera('profile::openstack::base::nova::network_public_ip'),
) {
if ($::fqdn == $nova_network_host) {
diff --git
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 4895097..8e44171 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -6,6 +6,7 @@
$network_flat_interface =
hiera('profile::openstack::labtest::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::labtest::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::labtest::nova::network_flat_interface_vlan'),
+ $network_public_ip =
hiera('profile::openstack::labtest::nova::network_public_ip'),
) {
require ::profile::openstack::labtest::nova::common
@@ -17,6 +18,7 @@
network_flat_interface => $network_flat_interface,
network_flat_tagged_base_interface =>
$network_flat_tagged_base_interface,
network_flat_interface_vlan => $network_flat_interface_vlan,
+ network_public_ip => $network_public_ip,
}
class {'::openstack2::nova::network::monitor':
diff --git a/modules/profile/manifests/openstack/main/nova/network/service.pp
b/modules/profile/manifests/openstack/main/nova/network/service.pp
index da8671e..7f75f07 100644
--- a/modules/profile/manifests/openstack/main/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/main/nova/network/service.pp
@@ -8,6 +8,7 @@
$network_flat_interface =
hiera('profile::openstack::main::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::main::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::main::nova::network_flat_interface_vlan'),
+ $network_public_ip =
hiera('profile::openstack::main::nova::network_public_ip'),
) {
require ::profile::openstack::main::nova::common
@@ -21,6 +22,7 @@
network_flat_interface => $network_flat_interface,
network_flat_tagged_base_interface =>
$network_flat_tagged_base_interface,
network_flat_interface_vlan => $network_flat_interface_vlan,
+ network_public_ip => $network_public_ip,
}
class {'::openstack2::nova::network::monitor':
--
To view, visit https://gerrit.wikimedia.org/r/376433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib83532ae2a38b817ec3bcf87ea085679f26f9af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
