Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347816 )
Change subject: Switchdc: rename redis stage from t05 to t06
......................................................................
Switchdc: rename redis stage from t05 to t06
Bug: T160178
Change-Id: I3e43cdb2d089e7ba436d9bc0218a9ff754b4f7be
---
M modules/profile/manifests/switchdc.pp
R modules/profile/templates/switchdc/t06_redis/config.yaml.erb
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/modules/profile/manifests/switchdc.pp
b/modules/profile/manifests/switchdc.pp
index 56fc125..8cbb1a3 100644
--- a/modules/profile/manifests/switchdc.pp
+++ b/modules/profile/manifests/switchdc.pp
@@ -74,8 +74,9 @@
require => File['/etc/switchdc'],
}
+ $redis_task = 't06_redis'
# Setup stage's configuration directories
- file { ['/etc/switchdc/stages.d/t05_redis']:
+ file { ["/etc/switchdc/stages.d/${redis_task}"]:
ensure => directory,
owner => 'root',
group => 'root',
@@ -83,32 +84,32 @@
require => File['/etc/switchdc/stages.d'],
}
- # Install t05_redis configuration
- file { '/etc/switchdc/stages.d/t05_redis/config.yaml':
+ # Install redis configuration
+ file { "/etc/switchdc/stages.d/${redis_task}/config.yaml":
ensure => present,
owner => 'root',
group => 'root',
mode => '0640',
- content => template('profile/switchdc/t05_redis/config.yaml.erb'),
- require => File['/etc/switchdc/stages.d/t05_redis'],
+ content => template("profile/switchdc/${redis_task}/config.yaml.erb"),
+ require => File["/etc/switchdc/stages.d/${redis_task}"],
}
- file { '/etc/switchdc/stages.d/t05_redis/jobqueue.yaml':
+ file { "/etc/switchdc/stages.d/${redis_task}/jobqueue.yaml":
ensure => present,
owner => 'root',
group => 'root',
mode => '0640',
content => ordered_yaml($redis_shards['jobqueue']),
- require => File['/etc/switchdc/stages.d/t05_redis'],
+ require => File["/etc/switchdc/stages.d/${redis_task}"],
}
- file { '/etc/switchdc/stages.d/t05_redis/sessions.yaml':
+ file { "/etc/switchdc/stages.d/${redis_task}/sessions.yaml":
ensure => present,
owner => 'root',
group => 'root',
mode => '0640',
content => ordered_yaml($redis_shards['sessions']),
- require => File['/etc/switchdc/stages.d/t05_redis'],
+ require => File["/etc/switchdc/stages.d/${redis_task}"],
}
}
diff --git a/modules/profile/templates/switchdc/t05_redis/config.yaml.erb
b/modules/profile/templates/switchdc/t06_redis/config.yaml.erb
similarity index 100%
rename from modules/profile/templates/switchdc/t05_redis/config.yaml.erb
rename to modules/profile/templates/switchdc/t06_redis/config.yaml.erb
--
To view, visit https://gerrit.wikimedia.org/r/347816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e43cdb2d089e7ba436d9bc0218a9ff754b4f7be
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
