opendev/puppet-infracloud
Code Issues Proposed changes

Install required packages for infracloud

Browse Source 
Current ansible install fails when does not find gcc
or openssl-dev. Add this before calling the ansible class.
Also remove uuid dependency from RHEL as package does
not exist.

Change-Id: I1c9002d669ec8df30ef09b3086f9f5297e032da1
This commit is contained in:
Yolanda Robla Mota 2016-09-16 11:06:14 +02:00
parent b3d0ecb24d
commit cad3ddc59c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/bifrost.pp
View File

@ -22,6 +22,7 @@ class infracloud::bifrost (
$ssh_public_key, $ssh_public_key,
$vlan, $vlan,
) { ) {
include ::infracloud::params
# The configdrive bifrost task defaults to copying the user's local public # The configdrive bifrost task defaults to copying the user's local public
# ssh key. Let's make sure it's there so that bifrost doesn't error and so we # ssh key. Let's make sure it's there so that bifrost doesn't error and so we
@ -40,8 +41,10 @@ class infracloud::bifrost (
before => Exec['install bifrost'], before => Exec['install bifrost'],
} }
ensure_packages($::infracloud::params::bifrost_req_packages)
class { '::ansible': class { '::ansible':
ansible_version => '2.1.1.0', ansible_version => '2.1.1.0',
require => Package[$::infracloud::params::bifrost_req_packages],
} }
class { '::mysql::server': class { '::mysql::server':
@ -70,10 +73,6 @@ class infracloud::bifrost (
require => Vcsrepo['/opt/stack/bifrost'], require => Vcsrepo['/opt/stack/bifrost'],
} }
package { 'uuid-runtime':
ensure => installed
}
exec { 'install bifrost dependencies': exec { 'install bifrost dependencies':
command => 'pip install -U -r /opt/stack/bifrost/requirements.txt', command => 'pip install -U -r /opt/stack/bifrost/requirements.txt',
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin', path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin',
@ -118,7 +117,7 @@ class infracloud::bifrost (
Exec['install bifrost dependencies'], Exec['install bifrost dependencies'],
File['/etc/bifrost/bifrost_global_vars'], File['/etc/bifrost/bifrost_global_vars'],
Vcsrepo['/opt/stack/bifrost'], Vcsrepo['/opt/stack/bifrost'],
Package['uuid-runtime'], Package[$::infracloud::params::bifrost_req_packages],
Class['::mysql::server'], Class['::mysql::server'],
], ],
} }

2
manifests/params.pp
View File

@ -4,10 +4,12 @@ class infracloud::params {
'Debian': { 'Debian': {
$cert_path = '/usr/local/share/ca-certificates' $cert_path = '/usr/local/share/ca-certificates'
$cert_command = '/usr/sbin/update-ca-certificates' $cert_command = '/usr/sbin/update-ca-certificates'
$bifrost_req_packages = [ 'gcc', 'libssl-dev', 'uuid-runtime' ]
} }
'Redhat': { 'Redhat': {
$cert_path = '/etc/pki/ca-trust/source/anchors' $cert_path = '/etc/pki/ca-trust/source/anchors'
$cert_command = '/usr/bin/update-ca-trust' $cert_command = '/usr/bin/update-ca-trust'
$bifrost_req_packages = [ 'gcc', 'openssl-devel' ]
} }
default: { default: {
fail('Only Debian and RedHat distros are supported.') fail('Only Debian and RedHat distros are supported.')