openstack/puppet-ironic
Code Issues Proposed changes

Clean up deprecated items supposed to be removed in Ocata and Pike

Browse Source 
* Support for disabling UEFI in inspector
* Authtoken signing_dir argument
* ironic::drivers::deploy manifest
* ironic::db::inspector_sync manifest
* enabled_drivers and rabbit_user from init manifest

This change leaves out the following deprecation
* Implicit including of ironic::pxe in inspector (due to unclear CI problems)
* Other rabbit_* parameters (THT still uses them, sigh)

Change-Id: Ibf1c64bb5a6538610dfd9529526f203374b4e7da
This commit is contained in:
Dmitry Tantsur
2017-03-17 10:46:42 +01:00
parent 82fcd162b5
commit 65186a41dd
10 changed files with 22 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api/authtoken.pp
View File

@ -185,12 +185,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*signing_dir*]
# (Optional) Directory used to cache files related to PKI tokens.
# Defaults to undef
#
class ironic::api::authtoken(
$username = 'ironic',
$password = $::os_service_default,
@ -227,8 +221,6 @@ class ironic::api::authtoken(
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) {
include ::ironic::deps
@ -237,10 +229,6 @@ class ironic::api::authtoken(
fail('Please set password for Ironic API service user')
}
if $signing_dir {
warning('signing_dir parameter is deprecated, has no effect and will be removed in the Pike release.')
}
keystone::resource::authtoken { 'ironic_config':
username => $username,
password => $password,

16
manifests/conductor.pp
View File

@ -175,13 +175,10 @@ class ironic::conductor (
include ::ironic::deps
include ::ironic::params
include ::ironic::drivers::deploy
# For backward compatibility
include ::ironic::glance
$enabled_drivers_real = pick($::ironic::enabled_drivers, $enabled_drivers)
if $cleaning_network_uuid {
warning('cleaning_network_uuid is deprecated, use cleaning_network')
}
@ -206,7 +203,7 @@ specified in the same time.")
moved to ironic::glance manifest")
}
validate_array($enabled_drivers_real)
validate_array($enabled_drivers)
validate_array($enabled_hardware_types)
# NOTE(dtantsur): all in-tree drivers are IPA-based, so it won't hurt
@ -215,7 +212,7 @@ moved to ironic::glance manifest")
# On Ubuntu, ipmitool dependency is missing and ironic-conductor fails to start.
# https://bugs.launchpad.net/cloud-archive/+bug/1572800
if (member($enabled_drivers_real, 'pxe_ipmitool') or
if (member($enabled_drivers, 'pxe_ipmitool') or
member($enabled_hardware_types, 'ipmi')) and $::osfamily == 'Debian' {
ensure_packages('ipmitool',
{
@ -248,19 +245,16 @@ moved to ironic::glance manifest")
}
}
$http_url_real = pick($::ironic::drivers::deploy::http_url, $http_url)
$http_root_real = pick($::ironic::drivers::deploy::http_root, $http_root)
# Configure ironic.conf
ironic_config {
'DEFAULT/enabled_drivers': value => join($enabled_drivers_real, ',');
'DEFAULT/enabled_drivers': value => join($enabled_drivers, ',');
'DEFAULT/enabled_hardware_types': value => join($enabled_hardware_types, ',');
'conductor/max_time_interval': value => $max_time_interval;
'conductor/force_power_state_during_sync': value => $force_power_state_during_sync;
'conductor/automated_clean': value => $automated_clean;
'conductor/api_url': value => $api_url;
'deploy/http_url': value => $http_url_real;
'deploy/http_root': value => $http_root_real;
'deploy/http_url': value => $http_url;
'deploy/http_root': value => $http_root;
'deploy/erase_devices_priority': value => $erase_devices_priority;
'deploy/erase_devices_metadata_priority': value => $erase_devices_metadata_priority;
'deploy/continue_if_disk_secure_erase_fails': value => $continue_if_disk_secure_erase_fails;

9
manifests/db/inspector_sync.pp
View File

@ -1,9 +0,0 @@
#
# Class to execute ironic-inspector dbsync (deprecated, use
# ironic::inspector::db::sync instead).
#
class ironic::db::inspector_sync {
warning('ironic::db::inspector_sync is deprecated, please use ironic::inspector::db::sync')
include ::ironic::inspector::db::sync
}

40
manifests/drivers/deploy.pp
View File

@ -1,40 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Configure the deploy_utils in Ironic
# This manifest is deprecated, use ironic::conductor directly instead.
#
# === Parameters
#
# [*http_url*]
# (optional) ironic-conductor node's HTTP server URL. DEPRECATED.
# Defaults to undef
#
# [*http_root*]
# (optional) ironic-conductor node's HTTP root path. DEPRECATED.
# Defaults to undef
#
class ironic::drivers::deploy (
$http_url = undef,
$http_root = undef,
) {
if $http_url {
warning('http_url is deprecated and will be removed after Newton cycle.')
}
if $http_root {
warning('http_root is deprecated and will be removed after Newton cycle.')
}
}

21
manifests/init.pp
View File

@ -242,16 +242,6 @@
#
# DEPRECATED PARAMETERS
#
# [*rabbit_user*]
# (optional) User to connect to the rabbit server.
# Defaults to undef.
# Deprecated, use rabbit_userid instead.
#
# [*enabled_drivers*]
# (optional) Array of drivers to load during service
# initialization. Deprecated and moved to conductor.
# Defaults to undef
#
# [*rabbit_host*]
# (optional) IP or hostname of the rabbit server. (string value)
# Defaults to $::os_service_default
@ -341,8 +331,6 @@ class ironic (
$sync_db = true,
$purge_config = false,
# DEPRECATED PARAMETERS
$rabbit_user = undef,
$enabled_drivers = undef,
$rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default,
$rabbit_password = $::os_service_default,
@ -362,13 +350,6 @@ class ironic (
include ::ironic::glance
include ::ironic::neutron
if $rabbit_user {
warning('The rabbit_user parameter is deprecated. Please use rabbit_userid instead.')
$rabbit_user_real = $rabbit_user
} else {
$rabbit_user_real = $rabbit_userid
}
if !is_service_default($rabbit_host) or
!is_service_default($rabbit_hosts) or
!is_service_default($rabbit_password) or
@ -419,7 +400,7 @@ ironic::glance::api_insecure and ironic::glance::num_retries accordingly")
if $rpc_backend in [$::os_service_default, 'ironic.openstack.common.rpc.impl_kombu', 'rabbit'] {
oslo::messaging::rabbit {'ironic_config':
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_user_real,
rabbit_userid => $rabbit_userid,
rabbit_virtual_host => $rabbit_virtual_host,
rabbit_use_ssl => $rabbit_use_ssl,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,

13
manifests/inspector.pp
View File

@ -196,12 +196,6 @@
#
# DEPRECATED
#
# [*enable_uefi*]
# (optional) Allow introspection of machines with UEFI firmware.
# This parameter is deprecated and will be removed. UEFI will always be
# enabled. Ignored unless $pxe_transfer_protocol='http'.
# Defaults to false.
#
# [*enable_setting_ipmi_credentials*]
# (optional) Enable setting of IPMI credentials
# Defaults to $::os::service_default
@ -252,7 +246,6 @@ class ironic::inspector (
$discovery_default_driver = $::os_service_default,
# DEPRECATED
$dnsmasq_ip_range = undef,
$enable_uefi = undef,
$enable_setting_ipmi_credentials = $::os_service_default,
) {
@ -282,12 +275,6 @@ class ironic::inspector (
$dnsmasq_ip_subnets_real = $dnsmasq_ip_subnets
}
if $enable_uefi == undef {
warning('UEFI will be enabled by default starting with Pike')
} else {
warning('enable_uefi is deprecated and will be hardcoded to true in Pike')
}
warning("After Newton cycle ::ironic::inspector won't provide \
tftpboot and httpboot setup, please include ::ironic::pxe")

12
manifests/inspector/authtoken.pp
View File

@ -185,12 +185,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*signing_dir*]
# (Optional) Directory used to cache files related to PKI tokens.
# Defaults to undef
#
class ironic::inspector::authtoken(
$username = 'ironic',
$password = $::os_service_default,
@ -227,8 +221,6 @@ class ironic::inspector::authtoken(
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) {
include ::ironic::deps
@ -237,10 +229,6 @@ class ironic::inspector::authtoken(
fail('Please set password for Ironic Inspector service user')
}
if $signing_dir {
warning('signing_dir parameter is deprecated, has no effect and will be removed in the Pike release.')
}
keystone::resource::authtoken { 'ironic_inspector_config':
username => $username,
password => $password,

16
releasenotes/notes/newton-deprecations-4a65e92bf2e1dedb.yaml Normal file
View File

@ -0,0 +1,16 @@
---
upgrade:
- |
Manifest ``ironic::drivers::deploy`` deprecated in Newton was removed.
- |
Deprecated parameter ``ironic::inspector::enable_uefi`` was removed.
UEFI support is now always enabled, when iPXE is used.
- |
Deprecated parameter ``signing_dir`` was removed from
``ironic::api::authtoken`` and ``ironic::inspector::authtoken``.
- |
Manifest ``ironic::db::inspector_sync`` deprecated in Newton was removed.
Use ``ironic::inspector::db::sync`` instead.
- |
Deprecated parameters ``rabbit_user`` and ``enabled_drivers`` were
removed from ``ironic`` manifest.

2
spec/classes/ironic_inspector_spec.rb
View File

@ -29,7 +29,6 @@ describe 'ironic::inspector' do
{ :package_ensure => 'present',
:enabled => true,
:pxe_transfer_protocol => 'tftp',
:enable_uefi => false,
:auth_strategy => 'keystone',
:dnsmasq_interface => 'br-ctlplane',
:ramdisk_logs_dir => '/var/log/ironic-inspector/ramdisk/',
@ -184,7 +183,6 @@ describe 'ironic::inspector' do
:pxe_transfer_protocol => 'http',
:additional_processing_hooks => 'hook1,hook2',
:ramdisk_kernel_args => 'foo=bar',
:enable_uefi => true,
:http_port => 3816,
:tftp_root => '/var/lib/tftpboot',
:http_root => '/var/www/httpboot',

4
templates/inspector_dnsmasq_http.erb
View File

@ -19,14 +19,10 @@ dhcp-option=option:router,<%= s['gateway'] %>
<% end -%>
dhcp-sequential-ip
dhcp-match=ipxe,175
<% if @enable_uefi -%>
dhcp-match=set:efi,option:client-arch,7
<% end -%>
# Client is running iPXE; move to next stage of chainloading
dhcp-boot=tag:ipxe,http://<%= @dnsmasq_local_ip %>:<%= @http_port_real %>/inspector.ipxe
<% if @enable_uefi -%>
# Client is running PXE over EFI; send EFI version of iPXE chainloader
dhcp-boot=tag:efi,ipxe.efi
# Client is running PXE over BIOS; send BIOS version of iPXE chainloader
<% end -%>
dhcp-boot=undionly.kpxe,localhost.localdomain,<%= @dnsmasq_local_ip %>