Dzahn has submitted this change and it was merged.
Change subject: puppet-lint: last 3 files with alignment issue, globally
......................................................................
puppet-lint: last 3 files with alignment issue, globally
Change-Id: I31d5b9e9e9e879981124d78de236f5788d8c777f
---
M manifests/role/debug_proxy.pp
M manifests/role/horizon.pp
M modules/openstack/manifests/horizon/service.pp
3 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/debug_proxy.pp b/manifests/role/debug_proxy.pp
index e624ca2..35d5f98 100644
--- a/manifests/role/debug_proxy.pp
+++ b/manifests/role/debug_proxy.pp
@@ -12,9 +12,11 @@
# - Allow X-Wikimedia-Debug to select mw1017 and mw1099 in EQIAD
# and mw2017 and mw2099 in CODFW.
# - For back-compat, pass 'X-Wikimedia-Debug: 1' requests to mw1017.
+ # lint:ignore:arrow_alignment
class { '::debug_proxy':
backend_regexp =>
'^((mw1017|mw1099)\.eqiad\.wmnet|(mw2017|mw2099)\.codfw\.wmnet)',
backend_aliases => { '1' => 'mw1017.eqiad.wmnet' },
resolver => join($::nameservers, ' '),
}
+ # lint:endignore
}
diff --git a/manifests/role/horizon.pp b/manifests/role/horizon.pp
index e07fe6e..b8734fb 100644
--- a/manifests/role/horizon.pp
+++ b/manifests/role/horizon.pp
@@ -14,7 +14,7 @@
}
class { '::openstack::envscripts':
- novaconfig => $novaconfig,
+ novaconfig => $novaconfig,
designateconfig => $designateconfig
}
}
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index 159ac99..c150333 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -185,10 +185,10 @@
# Arbitrary handy script that needs to be on the horizon host because it
only works with Liberty
file { '/root/makedomain':
- source =>
"puppet:///modules/openstack/${openstack_version}/virtscripts/makedomain",
- owner => 'root',
- group => 'root',
- mode => '0644',
+ source =>
"puppet:///modules/openstack/${openstack_version}/virtscripts/makedomain",
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
}
apache::site { $webserver_hostname:
--
To view, visit https://gerrit.wikimedia.org/r/278219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31d5b9e9e9e879981124d78de236f5788d8c777f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
