openstack
/
puppet-ironic
Code Issues Proposed changes

Fix Ironic modules so services properly run in Juno 

Initially, the module was not creating an ironic.conf file and now
it does.  The configurations that are being put into the ironic.conf
file come straight out of the documentation.

The package 'python-pbr' is required and was not being installed
elsewhere so it is installed by the init module.

The ironic-conductor service requires the execution of 'ironic-dbsync'
before it can be active.

In the params module, the 'RedHat' packages and services were named
incorrectly or were otherwise missing.

Change-Id: I73cecc590038fa7d9518453c448bfc243ddedff1
This commit is contained in:
Ryan Hallisey 2014-11-12 15:09:31 -05:00
parent 80f6900a92
commit fdddbf7456
3 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/api.pp
View File

@ -87,6 +87,7 @@ class ironic::api (
$admin_tenant_name = 'services',
$admin_user = 'ironic',
$admin_password,
$neutron_url = false,
) {
include ironic::params
@ -124,6 +125,12 @@ class ironic::api (
hasstatus => true,
}
if $neutron_url {
ironic_config { 'neutron/url': value => $neutron_url; }
} else {
ironic_config { 'neutron/url': value => "${auth_protocol}://${auth_host}:9696/"; }
}
if $auth_uri {
ironic_config { 'keystone_authtoken/auth_uri': value => $auth_uri; }
} else {
@ -156,5 +163,4 @@ class ironic::api (
}
}
}

30
manifests/init.pp
View File

@ -156,25 +156,32 @@ class ironic (
include ironic::params
Package['ironic'] -> Ironic_config<||>
Package['ironic-common'] -> Ironic_config<||>
File {
require => Package['ironic'],
require => Package['ironic-common'],
owner => 'root',
group => 'ironic',
mode => '0640',
}
file { '/etc/ironic':
require => Package['python-pbr'],
ensure => directory,
mode => '0750',
}
file { '/etc/ironic/ironic.conf': }
file { '/etc/ironic/ironic.conf':
mode => '0640',
}
package { 'ironic':
package { 'python-pbr':
ensure => $package_ensure,
name => $::ironic::params::package_name,
name => $::ironic::params::pbr_package,
}
package { 'ironic-common':
ensure => $package_ensure,
name => $::ironic::params::common_package_name,
}
validate_re($database_connection, '(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
@ -182,7 +189,6 @@ class ironic (
case $database_connection {
/mysql:\/\/\S+:\S+@\S+\/\S+/: {
$database_backend_package = false
require 'mysql::python'
}
/postgresql:\/\/\S+:\S+@\S+\/\S+/: {
$database_backend_package = 'python-psycopg2'
@ -226,6 +232,16 @@ class ironic (
'glance/glance_api_insecure': value => $glance_api_insecure;
}
Ironic_config['database/connection'] ~> Exec['ironic-dbsync']
exec { 'ironic-dbsync':
command => $::ironic::params::dbsync_command,
path => '/usr/bin',
user => 'ironic',
refreshonly => true,
logoutput => on_failure,
}
if $rpc_backend == 'ironic.openstack.common.rpc.impl_kombu' {
if ! $rabbit_password {
fail('When rpc_backend is rabbitmq, you must set rabbit password')

29
manifests/params.pp
View File

@ -20,22 +20,27 @@
class ironic::params {
$dbsync_command =
'ironic-dbsync --config-file /etc/ironic/ironic.conf'
case $::osfamily {
'RedHat': {
$package_name = 'openstack-ironic'
$api_package = false
$conductor_package = false
$api_service = 'ironic-api'
$conductor_service = 'ironic-conductor'
$client_package = 'python-ironicclient'
$common_package_name = 'openstack-ironic-common'
$api_package = 'openstack-ironic-api'
$api_service = 'openstack-ironic-api'
$conductor_package = 'openstack-ironic-conductor'
$conductor_service = 'openstack-ironic-conductor'
$client_package = 'python-ironicclient'
$pbr_package = 'python-pbr'
}
'Debian': {
$package_name = 'ironic-common'
$api_service = 'ironic-api'
$conductor_service = 'ironic-conductor'
$api_package = 'ironic-api'
$conductor_package = 'ironic-conductor'
$client_package = 'python-ironicclient'
$common_package_name = 'ironic-common'
$api_service = 'ironic-api'
$api_package = 'ironic-api'
$conductor_service = 'ironic-conductor'
$conductor_package = 'ironic-conductor'
$client_package = 'python-ironicclient'
$pbr_package = 'python-pbr'
}
default: {
fail("Unsupported osfamily ${::osfamily}")