Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/88760
Change subject: Adding deployment target for analytics/kraken repository ...................................................................... Adding deployment target for analytics/kraken repository Change-Id: I665969ca90274ebdd48fff8360b3848bb434e345 --- M manifests/role/analytics.pp A manifests/role/analytics/kraken.pp M manifests/role/deployment.pp 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/88760/1 diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp index e591f42..366d549 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 + include role::analytics::kraken } diff --git a/manifests/role/analytics/kraken.pp b/manifests/role/analytics/kraken.pp new file mode 100644 index 0000000..7475d65 --- /dev/null +++ b/manifests/role/analytics/kraken.pp @@ -0,0 +1,6 @@ +# == Class role::analytics::kraken +# Deployment for Kraken repository and versioned .jars +# only Analytics nodes, and eventually into HDFS. +class role::analytics::kraken { + deployment::target { 'analytics-kraken': } +} diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp index 38d9e05..be87c85 100644 --- a/manifests/role/deployment.pp +++ b/manifests/role/deployment.pp @@ -37,6 +37,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 +59,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 +105,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 +193,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: newchange Gerrit-Change-Id: I665969ca90274ebdd48fff8360b3848bb434e345 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits