From 14ba55836a3177f75bc29cda463f675371f8e419 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 8 Oct 2015 14:35:01 +1100 Subject: [PATCH] Move translate.openstack.org to Zanata 3.7.3 Remove the Zanata URL and checksum from translate.openstack.org. Due to the latest change in puppet-zanata, this will upgrade it to version 3.7.3. Remove it entirely so that the checksum type can be updated in puppet-zanata, and then it will be added back here to make sure translate doesn't upgrade without us watching. Change-Id: Ic98b9a76f2d2b7a9c3ca42f704a62336e8e0050c Depends-On: If794ec02cbecfde370304c41bad8cd011800fb2e --- manifests/site.pp | 2 -- modules/openstack_project/manifests/translate.pp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index be2c61b130..f787d51691 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -973,8 +973,6 @@ node 'translate.openstack.org' { zanata_server_user => hiera('proposal_zanata_user', 'XXX'), zanata_server_api_key => hiera('proposal_zanata_api_key', 'XXX'), zanata_wildfly_version => '9.0.1', - zanata_url => 'https://sourceforge.net/projects/zanata/files/webapp/zanata-war-3.7.1.war', - zanata_checksum => 'b741fac8cf7d11c9b15189e6899051eb', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', ssl_cert_file_contents => hiera('translate_ssl_cert_file_contents', 'XXX'), ssl_key_file_contents => hiera('translate_ssl_key_file_contents', 'XXX'), diff --git a/modules/openstack_project/manifests/translate.pp b/modules/openstack_project/manifests/translate.pp index ad0b139445..9cb019fd4e 100644 --- a/modules/openstack_project/manifests/translate.pp +++ b/modules/openstack_project/manifests/translate.pp @@ -23,8 +23,6 @@ class openstack_project::translate( $zanata_server_user = '', $zanata_server_api_key = '', $zanata_wildfly_version = '', - $zanata_url = '', - $zanata_checksum = '', $project_config_repo = '', $openid_url = '', $vhost_name = $::fqdn, @@ -52,8 +50,6 @@ class openstack_project::translate( zanata_admin_users => $admin_users, zanata_default_from_address => $from_address, zanata_wildfly_version => $wildfly_version, - zanata_url => $zanata_url, - zanata_checksum => $zanata_checksum, } class { '::zanata::apache':