opendev/system-config
Code Issues Proposed changes

Remove placeholder hiera defaults

Browse Source 
Now that the apply tests no longer require default values for all hiera
calls, remove the placeholder 'XXX' default values from translate.

Change-Id: I30d83b7dc170d8e7140108f4d35244e0995ac656
This commit is contained in:
K Jonathan Harker 2015-10-16 14:52:02 -07:00
parent cd00179976
commit 1e5de3feab
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/site.pp
View File

@ -990,16 +990,16 @@ node 'translate.openstack.org' {
listeners => ['ajp'],
from_address => 'noreply@openstack.org',
mysql_host => hiera('translate_mysql_host', 'localhost'),
mysql_password => hiera('translate_mysql_password', 'XXX'),
zanata_server_user => hiera('proposal_zanata_user', 'XXX'),
zanata_server_api_key => hiera('proposal_zanata_api_key', 'XXX'),
mysql_password => hiera('translate_mysql_password'),
zanata_server_user => hiera('proposal_zanata_user'),
zanata_server_api_key => hiera('proposal_zanata_api_key'),
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'),
ssl_chain_file_contents => hiera('translate_ssl_chain_file_contents', 'XXX'),
ssl_cert_file_contents => hiera('translate_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('translate_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('translate_ssl_chain_file_contents'),
}
}
@ -1012,9 +1012,9 @@ node 'translate-dev.openstack.org' {
listeners => ['ajp'],
from_address => 'noreply@openstack.org',
mysql_host => hiera('translate_dev_mysql_host', 'localhost'),
mysql_password => hiera('translate_dev_mysql_password', 'XXX'),
zanata_server_user => hiera('proposal_zanata_user', 'XXX'),
zanata_server_api_key => hiera('proposal_zanata_api_key', 'XXX'),
mysql_password => hiera('translate_dev_mysql_password'),
zanata_server_user => hiera('proposal_zanata_user'),
zanata_server_api_key => hiera('proposal_zanata_api_key'),
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
}
}