From 6cd71013f4e443b6ab7d999a56581b32bf8fe482 Mon Sep 17 00:00:00 2001 From: Mark Heiges Date: Thu, 1 Sep 2016 22:47:07 -0400 Subject: [PATCH] update dependency lists --- puppet/Puppetfile | 1 - puppet/Puppetfile.lock | 12 +++++++----- puppet/src/profiles/metadata.json | 6 +++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/puppet/Puppetfile b/puppet/Puppetfile index 4f3f083..c74d2fe 100644 --- a/puppet/Puppetfile +++ b/puppet/Puppetfile @@ -5,7 +5,6 @@ mod 'jlambert121/trusted_ca' mod 'puppet/archive' mod 'puppetlabs/java_ks' mod 'puppetlabs/stdlib' -mod 'stahnma/epel' mod 'ebrc/ebrc_yum_repo', :git => 'git@github.com:EuPathDB/puppet-ebrc_yum_repo.git' diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock index ae118d6..10edef0 100644 --- a/puppet/Puppetfile.lock +++ b/puppet/Puppetfile.lock @@ -9,8 +9,6 @@ FORGE puppetlabs-stdlib (< 5.0.0, >= 4.2.0) puppetlabs-java_ks (1.4.1) puppetlabs-stdlib (4.12.0) - stahnma-epel (1.2.2) - puppetlabs-stdlib (>= 3.0.0) GIT remote: git@github.com:EuPathDB/puppet-ebrc_java.git @@ -22,9 +20,10 @@ GIT GIT remote: git@github.com:EuPathDB/puppet-ebrc_jenkins.git ref: master - sha: 133ce0f678faa7af1a3a2a743c67baba09adee20 + sha: a31c44dc36dd8edd1235ee0e66f19fd37da6db01 specs: - ebrc-ebrc_jenkins (0.0.1) + ebrc-ebrc_jenkins (0.1.0) + puppet-archive (>= 0) GIT remote: git@github.com:EuPathDB/puppet-ebrc_yum_repo.git @@ -39,7 +38,11 @@ PATH specs: local-profiles (0.0.0) crayfishx-firewalld (>= 0) + ebrc-ebrc_java (>= 0) ebrc-ebrc_jenkins (>= 0) + ebrc-ebrc_yum_repo (>= 0) + jlambert121-trusted_ca (>= 0) + puppetlabs-stdlib (>= 0) DEPENDENCIES crayfishx-firewalld (>= 0) @@ -51,5 +54,4 @@ DEPENDENCIES puppet-archive (>= 0) puppetlabs-java_ks (>= 0) puppetlabs-stdlib (>= 0) - stahnma-epel (>= 0) diff --git a/puppet/src/profiles/metadata.json b/puppet/src/profiles/metadata.json index 1dc0951..c21d887 100644 --- a/puppet/src/profiles/metadata.json +++ b/puppet/src/profiles/metadata.json @@ -9,7 +9,11 @@ "issues_url": null, "dependencies": [ {"name":"ebrc/ebrc_jenkins"}, - {"name":"crayfishx/firewalld"} + {"name":"crayfishx/firewalld"}, + {"name":"ebrc/ebrc_yum_repo"}, + {"name":"ebrc/ebrc_java"}, + {"name":"puppetlabs/stdlib"}, + {"name":"jlambert121/trusted_ca"} ] }