Merge "Stop including ironic::pxe from ironic::inspector"

This commit is contained in:
Jenkins 2017-07-20 08:18:38 +00:00 committed by Gerrit Code Review
commit 514d7d465c
3 changed files with 10 additions and 5 deletions

View File

@ -292,11 +292,6 @@ class ironic::inspector (
$dnsmasq_ip_subnets_real = $dnsmasq_ip_subnets
}
warning("After Newton cycle ::ironic::inspector won't provide \
tftpboot and httpboot setup, please include ::ironic::pxe")
include ::ironic::pxe
$tftp_root_real = pick($::ironic::pxe::common::tftp_root, $tftp_root)
$http_root_real = pick($::ironic::pxe::common::http_root, $http_root)
$http_port_real = pick($::ironic::pxe::common::http_port, $http_port)

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
Manifest ``ironic::pxe`` is no longer included from ``ironic::inspector``.
This was deprecated in the Newton release. Please include it explicitly.
issues:
- |
ironic::pxe may not work under Ubuntu when using tftp due to packagaing
issues. Currently this is only tested under Red Hat based systems.

View File

@ -73,6 +73,7 @@ describe 'basic ironic' do
class { '::ironic::inspector::authtoken':
password => 'a_big_secret',
}
class { '::ironic::pxe': }
class { '::ironic::inspector':
ironic_password => 'a_big_secret',
ironic_auth_url => "https://${::fqdn}:5000/v2.0",