From 534c42d75cbd4e2394fc5c679b263157b0595ef3 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 23 Mar 2017 12:28:39 +0100 Subject: [PATCH] Clean up deprecated items in ironic manifest Change-Id: I3db082a4e74ef1d2852a64f884ba77484f5ae2b8 --- manifests/ironic.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 6668db6bd..e08a25810 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -39,7 +39,6 @@ class openstack_integration::ironic { rabbit_use_ssl => $::openstack_integration::config::ssl, database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8', debug => true, - enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'], } class { '::ironic::db::mysql': password => 'ironic', @@ -60,7 +59,6 @@ class openstack_integration::ironic { } class { '::ironic::client': } class { '::ironic::api': - neutron_url => "http://${::openstack_integration::config::ip_for_url}:9696", service_name => 'httpd', } include ::apache @@ -71,7 +69,9 @@ class openstack_integration::ironic { ssl_cert => $::openstack_integration::params::cert_path, workers => 2, } - class { '::ironic::conductor': } + class { '::ironic::conductor': + enabled_drivers => ['fake', 'pxe_ipmitool'], + } Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |> }