opendev/system-config
Code Issues Proposed changes

Merge "Add nodepool_ssh_public_key to nodepool.o.o"

Browse Source
This commit is contained in:
Jenkins 2016-05-25 22:02:47 +00:00 committed by Gerrit Code Review
commit 29300631bc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

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