Andrew Bogott has submitted this change and it was merged.
Change subject: Openstack: move wikistatus settings into hiera
......................................................................
Openstack: move wikistatus settings into hiera
Change-Id: Iceef20e8ddbf8f396ece6beb43ed814a2f74158d
---
M hieradata/eqiad.yaml
M modules/openstack/manifests/common.pp
M modules/openstack/templates/liberty/nova/nova.conf.erb
M modules/openstack/templates/mitaka/nova/nova.conf.erb
M modules/role/manifests/labs/openstack/nova/common.pp
5 files changed, 25 insertions(+), 29 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 8c53f2e..212275b 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -134,6 +134,13 @@
- labvirt1012
- labvirt1013
+wikitechstatusconfig:
+ host: 'wikitech.wikimedia.org'
+ domain: 'labs'
+ page_prefix: 'Nova_Resource:'
+ region: 'eqiad'
+ dns_domain: 'eqiad.wmflabs'
+
keystoneconfig:
auth_port: '35357'
auth_protocol: 'http'
diff --git a/modules/openstack/manifests/common.pp
b/modules/openstack/manifests/common.pp
index 69b62ef..a893c18 100644
--- a/modules/openstack/manifests/common.pp
+++ b/modules/openstack/manifests/common.pp
@@ -1,13 +1,7 @@
# common packages and config for openstack
class openstack::common(
$novaconfig,
- $instance_status_wiki_host,
- $instance_status_wiki_domain,
- $instance_status_wiki_page_prefix,
- $instance_status_wiki_region,
- $instance_status_dns_domain,
- $instance_status_wiki_user,
- $instance_status_wiki_pass,
+ $wikitechstatusconfig,
$openstack_version=$::openstack::version,
) {
diff --git a/modules/openstack/templates/liberty/nova/nova.conf.erb
b/modules/openstack/templates/liberty/nova/nova.conf.erb
index 206444d..a84cafb 100644
--- a/modules/openstack/templates/liberty/nova/nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/nova.conf.erb
@@ -80,13 +80,13 @@
notification_driver=wikistatus
notify_on_state_change=vm_state
-wiki_host=<%= @instance_status_wiki_host %>
-wiki_domain=<%= @instance_status_wiki_domain %>
-wiki_page_prefix=<%= @instance_status_wiki_page_prefix %>
-wiki_instance_region=<%= @instance_status_wiki_region %>
-wiki_login=<%= @instance_status_wiki_user %>
-wiki_password=<%= @instance_status_wiki_pass %>
-wiki_instance_dns_domain=<%= @instance_status_dns_domain %>
+wiki_host=<%= @wikitechstatusconfig["host"] %>
+wiki_domain=<%= @wikitechstatusconfig["domain"] %>
+wiki_page_prefix=<%= @wikitechstatusconfig["page_prefix"] %>
+wiki_instance_region=<%= @wikitechstatusconfig["region"] %>
+wiki_login=<%= @wikitechstatusconfig["user"] %>
+wiki_password=<%= @wikitechstatusconfig["pass"] %>
+wiki_instance_dns_domain=<%= @wikitechstatusconfig["dns_domain"] %>
# Designate things:
notification_driver = messagingv2
diff --git a/modules/openstack/templates/mitaka/nova/nova.conf.erb
b/modules/openstack/templates/mitaka/nova/nova.conf.erb
index 0d778a4..71c3a16 100644
--- a/modules/openstack/templates/mitaka/nova/nova.conf.erb
+++ b/modules/openstack/templates/mitaka/nova/nova.conf.erb
@@ -79,13 +79,13 @@
notification_driver=wikistatus
notify_on_state_change=vm_state
-wiki_host=<%= @instance_status_wiki_host %>
-wiki_domain=<%= @instance_status_wiki_domain %>
-wiki_page_prefix=<%= @instance_status_wiki_page_prefix %>
-wiki_instance_region=<%= @instance_status_wiki_region %>
-wiki_login=<%= @instance_status_wiki_user %>
-wiki_password=<%= @instance_status_wiki_pass %>
-wiki_instance_dns_domain=<%= @instance_status_dns_domain %>
+wiki_host=<%= @wikitechstatusconfig["host"] %>
+wiki_domain=<%= @wikitechstatusconfig["domain"] %>
+wiki_page_prefix=<%= @wikitechstatusconfig["page_prefix"] %>
+wiki_instance_region=<%= @wikitechstatusconfig["region"] %>
+wiki_login=<%= @wikitechstatusconfig["user"] %>
+wiki_password=<%= @wikitechstatusconfig["pass"] %>
+wiki_instance_dns_domain=<%= @wikitechstatusconfig["dns_domain"] %>
# Designate things:
notification_driver = messagingv2
diff --git a/modules/role/manifests/labs/openstack/nova/common.pp
b/modules/role/manifests/labs/openstack/nova/common.pp
index 26ce916..ec935f5 100644
--- a/modules/role/manifests/labs/openstack/nova/common.pp
+++ b/modules/role/manifests/labs/openstack/nova/common.pp
@@ -5,6 +5,7 @@
$novaconfig_pre = hiera_hash('novaconfig', {})
$keystoneconfig = hiera_hash('keystoneconfig', {})
+ $wikitechstatusconfig = hiera_hash('wikitechstatusconfig',
{})
$keystone_host = hiera('labs_keystone_host')
$nova_controller = hiera('labs_nova_controller')
@@ -25,14 +26,8 @@
$novaconfig = deep_merge($novaconfig_pre, $extra_novaconfig)
class { '::openstack::common':
- novaconfig => $novaconfig,
- instance_status_wiki_host => $status_wiki_host_master,
- instance_status_wiki_domain => 'labs',
- instance_status_wiki_page_prefix => 'Nova_Resource:',
- instance_status_wiki_region => $::site,
- instance_status_dns_domain => "${::site}.wmflabs",
- instance_status_wiki_user =>
$passwords::misc::scripts::wikinotifier_user,
- instance_status_wiki_pass =>
$passwords::misc::scripts::wikinotifier_pass,
+ novaconfig => $novaconfig,
+ wikitechstatusconfig => $wikitechstatusconfig,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/323095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iceef20e8ddbf8f396ece6beb43ed814a2f74158d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
