x/puppet-midonet
Code Issues Proposed changes

[MDT-40] Fix dependency cycle to apt::key/apt::source

Browse Source 
This patch fix a dependency cycle problem due to apt::source
class is already declaring the resource apt::key and we were forcing
the reverse dependency ordering in midonet::repository::ubuntu

Change-Id: Ifd16de6d74e7bf060de81474209222f3ff7f7356
This commit is contained in:
Carmela Rubinos
2015-08-08 13:21:13 +02:00
parent 88dec449dd
commit 53ed3b4544
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/repository/ubuntu.pp
View File

@@ -46,15 +46,12 @@ class midonet::repository::ubuntu (
# time, but it ensures it will not fail for out of date repository info # time, but it ensures it will not fail for out of date repository info
# Exec['apt_update'] -> Package<| |> # Exec['apt_update'] -> Package<| |>
apt::key {'midonetkey':
key => $midonet_key,
key_source => $midonet_key_url,
}
apt::source {'midonet': apt::source {'midonet':
comment => 'Midonet apt repository', comment => 'Midonet apt repository',
location => $midonet_repo, location => $midonet_repo,
release => $midonet_stage, release => $midonet_stage,
key => $midonet_key,
key_source => $midonet_key_url,
include_src => false, include_src => false,
} }
@@ -74,7 +71,6 @@ class midonet::repository::ubuntu (
} }
Apt::Key<| |> -> Apt::Source<| |>
Apt::Source<| |> -> Exec<| command == 'update-midonet-repos' |> Apt::Source<| |> -> Exec<| command == 'update-midonet-repos' |>
} }