diff --git a/manifests/inspector.pp b/manifests/inspector.pp index 2558eeb8..7aaaf483 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -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) diff --git a/releasenotes/notes/inspector-pxe-4338e86b88a7f572.yaml b/releasenotes/notes/inspector-pxe-4338e86b88a7f572.yaml new file mode 100644 index 00000000..a1f8c053 --- /dev/null +++ b/releasenotes/notes/inspector-pxe-4338e86b88a7f572.yaml @@ -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. diff --git a/spec/acceptance/ironic_wsgi_apache_spec.rb b/spec/acceptance/ironic_wsgi_apache_spec.rb index 5181c356..e58bcd35 100644 --- a/spec/acceptance/ironic_wsgi_apache_spec.rb +++ b/spec/acceptance/ironic_wsgi_apache_spec.rb @@ -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",