diff --git a/manifests/midonet_agent/install.pp b/manifests/midonet_agent/install.pp index 06199c3..92ac5a2 100644 --- a/manifests/midonet_agent/install.pp +++ b/manifests/midonet_agent/install.pp @@ -26,13 +26,10 @@ class midonet::midonet_agent::install ( $install_java = true ) { - require midonet::repository - if ($install_java == true) { if ! defined(Class['java']) { class { 'java': distribution => 'jre', - require => Exec['update-midonet-repos'] } } } diff --git a/manifests/midonet_agent/run.pp b/manifests/midonet_agent/run.pp index 135295e..8823a9d 100644 --- a/manifests/midonet_agent/run.pp +++ b/manifests/midonet_agent/run.pp @@ -26,8 +26,6 @@ class midonet::midonet_agent::run ( $zk_servers, $cs_seeds) { - require midonet::midonet_agent::install - file {'/etc/midolman/midolman.conf': ensure => present, content => template('midonet/midonet-agent/midolman.conf.erb'), diff --git a/manifests/midonet_api.pp b/manifests/midonet_api.pp index 1857a02..86a5368 100644 --- a/manifests/midonet_api.pp +++ b/manifests/midonet_api.pp @@ -106,8 +106,6 @@ class midonet::midonet_api( $bind_address='0.0.0.0', $catalina_base) { - include midonet::midonet_api::augeas - class {'midonet::midonet_api::install': } class {'midonet::midonet_api::run': diff --git a/manifests/midonet_api/augeas.pp b/manifests/midonet_api/augeas.pp index 25c105e..d1d220d 100644 --- a/manifests/midonet_api/augeas.pp +++ b/manifests/midonet_api/augeas.pp @@ -4,8 +4,6 @@ class midonet::midonet_api::augeas { - require midonet::repository - case $::osfamily { 'Debian': { package {'libaugeas-ruby': diff --git a/manifests/midonet_api/install.pp b/manifests/midonet_api/install.pp index dc1967f..aa9ce8d 100644 --- a/manifests/midonet_api/install.pp +++ b/manifests/midonet_api/install.pp @@ -27,7 +27,6 @@ class midonet::midonet_api::install ( $manage_app_server = true ) { - require midonet::repository require midonet::midonet_api::augeas if ($manage_app_server == true) { @@ -35,17 +34,14 @@ class midonet::midonet_api::install ( if ! defined(Class['java']) { class { 'java': distribution => 'jre', - require => Exec['update-midonet-repos'] } -> class { 'tomcat': install_from_source => false, - require => Exec['update-midonet-repos'] } } else { class { 'tomcat': install_from_source => false, - require => Exec['update-midonet-repos'] } } } diff --git a/manifests/midonet_api/run.pp b/manifests/midonet_api/run.pp index f0be2b4..eb09412 100644 --- a/manifests/midonet_api/run.pp +++ b/manifests/midonet_api/run.pp @@ -37,8 +37,6 @@ class midonet::midonet_api::run ( $bind_address ) { - require midonet::midonet_api::install - tomcat::instance{'midonet-api': package_name => $tomcat_package, } -> diff --git a/manifests/midonet_cli.pp b/manifests/midonet_cli.pp index 9abf70f..6a3c889 100644 --- a/manifests/midonet_cli.pp +++ b/manifests/midonet_cli.pp @@ -37,11 +37,8 @@ class midonet::midonet_cli( $tenant_name='admin', ) { - require midonet::repository - package {'python-midonetclient': ensure => present, - require => Exec['update-midonet-repos'] } midonet_client_conf { diff --git a/manifests/neutron_plugin.pp b/manifests/neutron_plugin.pp index ea3c7f3..67a91a5 100644 --- a/manifests/neutron_plugin.pp +++ b/manifests/neutron_plugin.pp @@ -76,11 +76,8 @@ class midonet::neutron_plugin ( $sync_db = false ) { - require midonet::repository - package {'python-neutron-plugin-midonet': ensure => present, - require => Exec['update-midonet-repos'] } -> class {'neutron::plugins::midonet':