openstack/fuel-library
Code Issues Proposed changes

Fix astute from pkg installation

Browse Source 
* Added rabbitmq_host to nailgun::astute class.
* Remove unneeded packages from install

blueprint fuel-containerization-of-services

Change-Id: I7eb83da970d7c8d4268641112f560820e77bd6c6
This commit is contained in:
Matthew Mosesohn 2014-03-28 16:58:12 +04:00 committed by Gerrit Code Review
parent a9dbc86736
commit a580ff0e14
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/nailgun/manifests/astute.pp
View File

@ -1,4 +1,6 @@
class nailgun::astute(
$production = 'prod',
$rabbitmq_host = 'localhost',
$rabbitmq_astute_user = 'naily',
$rabbitmq_astute_password = 'naily',
$version,

11
deployment/puppet/nailgun/manifests/init.pp
View File

@ -35,6 +35,7 @@ class nailgun(
$astute_version,
$nailgun_api_url = "http://${::fuel_settings['ADMIN_NETWORK']['ipaddress']}:8000/api",
$rabbitmq_host = $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
$rabbitmq_astute_user = "naily",
$rabbitmq_astute_password = "naily",
$puppet_master_hostname = "${hostname}.${domain}",
@ -138,10 +139,12 @@ class nailgun(
}
class {"nailgun::astute":
rabbitmq_astute_user => $astute_user,
rabbitmq_astute_password => $astute_password,
version => $astute_version,
gem_source => $gem_source,
production => $production,
rabbitmq_host => $rabbitmq_host,
rabbitmq_astute_user => $rabbitmq_astute_user,
rabbitmq_astute_password => $rabbitmq_astute_password,
version => $astute_version,
gem_source => $gem_source,
}
if $production == 'prod' {

15
deployment/puppet/nailgun/manifests/packages.pp
View File

@ -10,16 +10,17 @@ class nailgun::packages(
nailgun_safe_package { "supervisor": }
nailgun_safe_package { "nginx": }
nailgun_safe_package { "python-virtualenv": }
#FIXME: provide only binary packages, do not build gems and eggs
if ( $production == 'dev' ) {
nailgun_safe_package { "python-virtualenv": }
nailgun_safe_package { "python-devel": }
nailgun_safe_package { "postgresql-devel": }
nailgun_safe_package { "gcc": }
nailgun_safe_package { "gcc-c++": }
nailgun_safe_package { "make": }
}
nailgun_safe_package { "python-devel": }
nailgun_safe_package { "postgresql-libs": }
nailgun_safe_package { "postgresql-devel": }
nailgun_safe_package { "gcc": }
nailgun_safe_package { "gcc-c++": }
nailgun_safe_package { "make": }
nailgun_safe_package { "rsyslog": }
# nailgun_safe_package { "cman": }

2
deployment/puppet/nailgun/templates/astuted.conf.erb
View File

@ -1,4 +1,4 @@
broker_host: 'localhost'
broker_host: '<%= @rabbitmq_host %>'
broker_port: 5672
broker_username: '<%= @rabbitmq_astute_user %>'
broker_password: '<%= @rabbitmq_astute_password %>'