Ottomata has submitted this change and it was merged.
Change subject: Adding deployment target for analytics/kraken repository
......................................................................
Adding deployment target for analytics/kraken repository
Change-Id: I665969ca90274ebdd48fff8360b3848bb434e345
---
M manifests/role/analytics.pp
M manifests/role/deployment.pp
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index e591f42..97edfa8 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -40,6 +40,9 @@
include misc::udp2log::udp_filter
# include dclass for device classification
include role::analytics::dclass
+
+ # include Kraken repository deployment target
+ deployment::target { 'analytics-kraken': }
}
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 38d9e05..420bd02 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -20,6 +20,7 @@
"eventlogging/EventLogging" =>
"http://${deploy_server_eqiad}/eventlogging/EventLogging";,
"fluoride/fluoride" => "http://${deploy_server_eqiad}/fluoride/fluoride";,
"test/testrepo" => "http://${deploy_server_eqiad}/test/testrepo";,
+ 'analytics/kraken' => "http://${deploy_server_eqiad}/analytics/kraken";,
},
"eqiad" => {
"private" => "http://${deploy_server_eqiad}/mediawiki/private";,
@@ -37,6 +38,7 @@
"fluoride/fluoride" => "http://${deploy_server_eqiad}/fluoride/fluoride";,
"test/testrepo" => "http://${deploy_server_eqiad}/test/testrepo";,
"elasticsearch/plugins" =>
"http://${deploy_server_eqiad}/elasticsearch/plugins";,
+ 'analytics/kraken' => "http://${deploy_server_eqiad}/analytics/kraken";,
},
}
# deployment_target grain value for this repo. This must match the
deployment::target
@@ -58,6 +60,7 @@
"fluoride/fluoride" => "fluoride",
"test/testrepo" => "testrepo",
"elasticsearch/plugins" => "elasticsearchplugins",
+ 'analytics/kraken' => 'analytics-kraken',
}
# Sed the .gitmodules file for the repo according to the following rules
# TODO: rename this to something more specific
@@ -103,6 +106,7 @@
"fluoride/fluoride" => "/srv/deployment/fluoride/fluoride",
"test/testrepo" => "/srv/deployment/test/testrepo",
"elasticsearch/plugins" => "/srv/deployment/elasticsearch/plugins",
+ 'analytics/kraken' => '/srv/analytics/kraken',
}
# ensure dependent repos are fetched and checked out with this repo
# repos fetched/checkedout in order
@@ -190,6 +194,7 @@
deployment::deployment_repo_sync_hook_link { "fluoride/fluoride": target =>
"shared.py" }
deployment::deployment_repo_sync_hook_link { "test/testrepo": target =>
"shared.py" }
deployment::deployment_repo_sync_hook_link { "elasticsearch/plugins": target
=> "shared.py" }
+ deployment::deployment_repo_sync_hook_link { 'analytics/kraken': target =>
"shared.py" }
class { "apache": }
class { "apache::mod::dav": }
--
To view, visit https://gerrit.wikimedia.org/r/88760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I665969ca90274ebdd48fff8360b3848bb434e345
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Akosiaris <[email protected]>
Gerrit-Reviewer: Ottomata <[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
