x/puppet-midonet
Code Issues Proposed changes

Remove all require::repository statements

Browse Source 
A component already installed should be configured without set the
repository and try to install every time.

Change-Id: I34f3b13c317e4ed9959f0553a4cc0b839c56804c
This commit is contained in:
Jaume Devesa 2015-10-22 11:48:41 +02:00
parent 4b530c02c9
commit 9a54db9438
8 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/midonet_agent/install.pp
View File

@ -26,13 +26,10 @@ class midonet::midonet_agent::install (
$install_java = true $install_java = true
) { ) {
require midonet::repository
if ($install_java == true) { if ($install_java == true) {
if ! defined(Class['java']) { if ! defined(Class['java']) {
class { 'java': class { 'java':
distribution => 'jre', distribution => 'jre',
require => Exec['update-midonet-repos']
} }
} }
} }

2
manifests/midonet_agent/run.pp
View File

@ -26,8 +26,6 @@ class midonet::midonet_agent::run (
$zk_servers, $zk_servers,
$cs_seeds) { $cs_seeds) {
require midonet::midonet_agent::install
file {'/etc/midolman/midolman.conf': file {'/etc/midolman/midolman.conf':
ensure => present, ensure => present,
content => template('midonet/midonet-agent/midolman.conf.erb'), content => template('midonet/midonet-agent/midolman.conf.erb'),

2
manifests/midonet_api.pp
View File

@ -106,8 +106,6 @@ class midonet::midonet_api(
$bind_address='0.0.0.0', $bind_address='0.0.0.0',
$catalina_base) { $catalina_base) {
include midonet::midonet_api::augeas
class {'midonet::midonet_api::install': } class {'midonet::midonet_api::install': }
class {'midonet::midonet_api::run': class {'midonet::midonet_api::run':

2
manifests/midonet_api/augeas.pp
View File

@ -4,8 +4,6 @@
class midonet::midonet_api::augeas { class midonet::midonet_api::augeas {
require midonet::repository
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
package {'libaugeas-ruby': package {'libaugeas-ruby':

4
manifests/midonet_api/install.pp
View File

@ -27,7 +27,6 @@ class midonet::midonet_api::install (
$manage_app_server = true $manage_app_server = true
) { ) {
require midonet::repository
require midonet::midonet_api::augeas require midonet::midonet_api::augeas
if ($manage_app_server == true) { if ($manage_app_server == true) {
@ -35,17 +34,14 @@ class midonet::midonet_api::install (
if ! defined(Class['java']) { if ! defined(Class['java']) {
class { 'java': class { 'java':
distribution => 'jre', distribution => 'jre',
require => Exec['update-midonet-repos']
} -> } ->
class { 'tomcat': class { 'tomcat':
install_from_source => false, install_from_source => false,
require => Exec['update-midonet-repos']
} }
} else { } else {
class { 'tomcat': class { 'tomcat':
install_from_source => false, install_from_source => false,
require => Exec['update-midonet-repos']
} }
} }
} }

2
manifests/midonet_api/run.pp
View File

@ -37,8 +37,6 @@ class midonet::midonet_api::run (
$bind_address $bind_address
) { ) {
require midonet::midonet_api::install
tomcat::instance{'midonet-api': tomcat::instance{'midonet-api':
package_name => $tomcat_package, package_name => $tomcat_package,
} -> } ->

3
manifests/midonet_cli.pp
View File

@ -37,11 +37,8 @@ class midonet::midonet_cli(
$tenant_name='admin', $tenant_name='admin',
) { ) {
require midonet::repository
package {'python-midonetclient': package {'python-midonetclient':
ensure => present, ensure => present,
require => Exec['update-midonet-repos']
} }
midonet_client_conf { midonet_client_conf {

3
manifests/neutron_plugin.pp
View File

@ -76,11 +76,8 @@ class midonet::neutron_plugin (
$sync_db = false $sync_db = false
) { ) {
require midonet::repository
package {'python-neutron-plugin-midonet': package {'python-neutron-plugin-midonet':
ensure => present, ensure => present,
require => Exec['update-midonet-repos']
} -> } ->
class {'neutron::plugins::midonet': class {'neutron::plugins::midonet':