x/puppet-midonet
Code Issues Proposed changes

Adds additional ensures to midonet::{cli,cluster}

Browse Source 
Change-Id: I8d32bfae8571e3d6f916c14c316e0787c954c892
This commit is contained in:
Alejandro Andreu 2016-09-26 13:18:53 +02:00
parent 59ec3e09e6
commit bd5bf4d0cb
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/cli.pp
View File

@ -43,20 +43,24 @@
# limitations under the License.
#
class midonet::cli(
$api_endpoint='http://127.0.0.1:8181/midonet-api',
$username='admin',
$password='admin',
$tenant_name='admin',
$api_endpoint = 'http://127.0.0.1:8181/midonet-api',
$username = 'admin',
$password = 'admin',
$tenant_name = 'admin',
$package_ensure = 'present',
$manage_epel = true,
) {
if $::osfamily == 'RedHat' {
package { 'epel-release':
ensure => installed,
before => Package['python-midonetclient']
if $manage_epel {
package { 'epel-release':
ensure => installed,
before => Package['python-midonetclient']
}
}
}
package { 'python-midonetclient': ensure => present, }
package { 'python-midonetclient': ensure => $package_ensure, }
midonet_client_conf {
'cli/api_url': value => $api_endpoint;

6
manifests/cluster.pp
View File

@ -89,6 +89,7 @@ class midonet::cluster (
$keystone_protocol = undef,
$keystone_tenant_name = undef,
$package_name = undef,
$package_ensure = undef,
$service_name = undef,
$service_ensure = undef,
$service_enable = undef,
@ -106,8 +107,9 @@ class midonet::cluster (
) {
class { 'midonet::cluster::install':
package_name => $package_name,
is_mem => $is_mem
package_ensure => $package_ensure,
package_name => $package_name,
is_mem => $is_mem
}
contain 'midonet::cluster::install'

5
manifests/cluster/install.pp
View File

@ -23,18 +23,19 @@
# limitations under the License.
#
class midonet::cluster::install (
$package_ensure = 'present',
$package_name = 'midonet-cluster',
$is_mem = false
) {
package { 'midonet-cluster':
ensure => present,
ensure => $package_ensure,
name => $package_name,
}
if $is_mem {
package { 'midonet-cluster-mem':
ensure => present,
ensure => $package_ensure,
require => Class['midonet::repository']}
}
else {