x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

[Gerrit] Hardcoded address for binaries was removed

Browse Source 
The address of the Gerrit's war-archive was the constant in the puppet script
and gui parameter had no effect. This patch is to change behaviour to use
value address pointed in the GUI .

Change-Id: I5c883b28f0b68f3cb35004c0a2e24ca6066de84e
This commit is contained in:
Alexey Khivin 2016-04-08 21:19:02 +03:00
parent 5d59537959
commit a3e358b7e5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano-apps/Gerrit/package/Classes/Gerrit.yaml
View File

@ -15,7 +15,8 @@ Properties:
Contract: $.class(puppet:PuppetInstance).notNull()
name:
Contract: $.string().notNull()
warUrl:
Contract: $.string().notNull()
Methods:
initialize:
Body:
@ -66,6 +67,7 @@ Methods:
createConfiguration:
Body:
- $.instance.setHieraValue( 'gerrit_war_url', $this.warUrl)
- $.instance.setHieraValue( 'project_config_repo', 'https://review.fuel-infra.org/open-paas/project-config')
- $.instance.setHieraValue( 'gerrit_github_token', 'f84013d50c69e60e902f748ea75c611695f35ef2')
- $.instance.setHieraValue( 'github_project_username', 'mirademo')

5
murano-apps/Gerrit/package/Resources/scripts/site.pp
View File

@ -18,11 +18,11 @@ node default {
ssh_rsa_pubkey_contents => hiera('gerrit_ssh_rsa_pubkey_contents'),
ssh_project_rsa_key_contents => hiera('gerrit_ssh_project_rsa_key_contents'),
ssh_project_rsa_pubkey_contents => hiera('gerrit_ssh_project_rsa_pubkey_contents'),
ssh_replication_rsa_key_contents => hiera('ssh_replication_rsa_key_contents'),
ssh_replication_rsa_pubkey_contents => hiera('gerrit_replication_ssh_rsa_pubkey_contents'),
ssh_welcome_rsa_key_contents => hiera('welcome_message_gerrit_ssh_private_key'),
ssh_welcome_rsa_pubkey_contents => hiera('welcome_message_gerrit_ssh_public_key'),
email => 'review@openstack.org',
# 1 + 100 + 9 + 2 + 2 + 25 => 139(rounded up)
@ -35,8 +35,7 @@ node default {
index_threads => 4,
httpd_maxqueued => '200',
httpd_maxwait => '5000min',
war =>
'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.11.4.11.a14450f.war',
war => hiera('gerrit_war_url'),
contactstore => false,
contactstore_appsec => '',
contactstore_pubkey => '',