Merge pull request #1338 from haus/ticket/stable/pdb-1389-add-puppet-…

…agent-dependency (PDB-1389) Add puppet-agent option for debian dependencies
puppetlabs · Apr 6, 2015 · ee6e9e9 · ee6e9e9
2 parents a86e5b9 + 84ffce5
commit ee6e9e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ext/templates/deb/control.erb b/ext/templates/deb/control.erb
@@ -15,7 +15,7 @@ Architecture: all
 <% if @pe -%>
 Depends: ${misc:Depends}, pe-java, adduser, pe-puppet (>= <%= @puppetminversion %>)
 <% else -%>
-Depends: ${misc:Depends},  java7-runtime-headless | j2re1.7, adduser, puppet (>= <%= @puppetminversion %>)
+Depends: ${misc:Depends},  java7-runtime-headless | j2re1.7, adduser, puppet (>= <%= @puppetminversion %>) | puppet-agent
 Suggests: postgresql
 <% end -%>
 Description:PuppetDB Centralized Storage.
@@ -25,6 +25,6 @@ Architecture: all
 <% if @pe -%>
 Depends:  ${misc:Depends}, pe-puppet (>= <%= @puppetminversion %>)
 <% else -%>
-Depends:  ${misc:Depends}, puppet-common (>= <%= @puppetminversion %>), libjson-ruby | ruby-json
+Depends:  ${misc:Depends}, puppet-common (>= <%= @puppetminversion %>) | puppet-agent, libjson-ruby | ruby-json
 <% end -%>
 Description:Connect Puppet to PuppetDB by setting up a terminus for PuppetDB.