Merge "Expose the vhost_name parameter on openstack_project::nodepool"

This commit is contained in:
Jenkins 2014-10-24 13:34:47 +00:00 committed by Gerrit Code Review
commit 05a8acf0e7
2 changed files with 3 additions and 1 deletions

View File

@ -24,7 +24,7 @@ class nodepool (
$git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
$revision = 'master',
$statsd_host = '',
$vhost_name = 'nodepool.openstack.org',
$vhost_name = $::fqdn,
$image_log_document_root = '/var/log/nodepool/image',
$enable_image_log_via_http = false,
$environment = {},

View File

@ -5,6 +5,7 @@ class openstack_project::nodepool_prod(
$mysql_password,
$nodepool_ssh_private_key = '',
$nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
$vhost_name = 'nodepool.openstack.org',
$sysadmins = [],
$statsd_host = '',
$jenkins_api_user ='',
@ -36,6 +37,7 @@ class openstack_project::nodepool_prod(
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
vhost_name => $vhost_name,
statsd_host => $statsd_host,
image_log_document_root => $image_log_document_root,
enable_image_log_via_http => $enable_image_log_via_http,