openstack/instack-undercloud
Code Issues Proposed changes

Merge "Update puppet configuration for ironic-inspector"

Browse Source
This commit is contained in:
Jenkins
2016-02-11 11:01:05 +00:00
committed by Gerrit Code Review
parent ee7290f385 55ed2b28db
commit 83bb69ac03
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/puppet-stack-config.pp
View File

@@ -372,7 +372,7 @@ ironic_config {
'DEFAULT/my_ip': value => hiera('controller_host');
'DEFAULT/rpc_response_timeout': value => '600';
'glance/host': value => hiera('glance::api::bind_host');
'discoverd/enabled': value => true;
'inspector/enabled': value => true;
'pxe/http_url': value => 'http://$my_ip:8088';
'pxe/http_root': value => '/httpboot';
'conductor/clean_nodes': value => hiera('ironic::conductor::clean_nodes');

2
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@@ -344,6 +344,7 @@ ironic::inspector::ironic_tenant_name: 'service'
ironic::inspector::ironic_auth_url: "http://{{LOCAL_IP}}:5000/v2.0"
ironic::inspector::ironic_max_retries: 6
ironic::inspector::ironic_retry_interval: 10
ironic::inspector::store_data: 'swift'
ironic::inspector::swift_username: 'ironic'
ironic::inspector::swift_password: "%{hiera('ironic::api::admin_password')}"
ironic::inspector::swift_tenant_name: 'service'
@@ -351,6 +352,7 @@ ironic::inspector::swift_auth_url: "http://{{LOCAL_IP}}:5000/v2.0"
ironic::inspector::dnsmasq_local_ip: {{LOCAL_IP}}
ironic::inspector::dnsmasq_ip_range: {{INSPECTION_IPRANGE}}
ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}}
ironic::inspector::ramdisk_collectors: 'default,logs'
# Rabbit
rabbit_cookie: {{UNDERCLOUD_RABBIT_COOKIE}}