openstack/puppet-openstack-integration
Code Issues Proposed changes

Clean up deprecated items in ironic manifest

Browse Source 
Change-Id: I3db082a4e74ef1d2852a64f884ba77484f5ae2b8
This commit is contained in:
Dmitry Tantsur 2017-03-23 12:28:39 +01:00
parent 1dba54323f
commit 534c42d75c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/ironic.pp
View File

@ -39,7 +39,6 @@ class openstack_integration::ironic {
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8', database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8',
debug => true, debug => true,
enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'],
} }
class { '::ironic::db::mysql': class { '::ironic::db::mysql':
password => 'ironic', password => 'ironic',
@ -60,7 +59,6 @@ class openstack_integration::ironic {
} }
class { '::ironic::client': } class { '::ironic::client': }
class { '::ironic::api': class { '::ironic::api':
neutron_url => "http://${::openstack_integration::config::ip_for_url}:9696",
service_name => 'httpd', service_name => 'httpd',
} }
include ::apache include ::apache
@ -71,7 +69,9 @@ class openstack_integration::ironic {
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
workers => 2, workers => 2,
} }
class { '::ironic::conductor': } class { '::ironic::conductor':
enabled_drivers => ['fake', 'pxe_ipmitool'],
}
Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |> Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |>
} }