opendev/system-config
Code Issues Proposed changes

Merge "Add zuul-worker public key to nodepool.o.o"

Browse Source
This commit is contained in:
Jenkins 2016-06-08 13:17:17 +00:00 committed by Gerrit Code Review
commit f5a4ba7073
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -770,9 +770,9 @@ node 'nodepool.openstack.org' {
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
mysql_password => hiera('nodepool_mysql_password'), mysql_password => hiera('nodepool_mysql_password'),
mysql_root_password => hiera('nodepool_mysql_root_password'), mysql_root_password => hiera('nodepool_mysql_root_password'),
# NOTE(pabelanger): Once we delete our jenkins masters, this key should be moved nodepool_ssh_public_key => hiera('zuul_worker_ssh_public_key_contents'),
# into hiera. # TODO(pabelanger): Switch out private key with zuul_worker once we are
nodepool_ssh_public_key => $openstack_project::jenkins_ssh_key, # ready.
nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
oscc_file_contents => $clouds_yaml, oscc_file_contents => $clouds_yaml,
image_log_document_root => '/var/log/nodepool/image', image_log_document_root => '/var/log/nodepool/image',