Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding missing dependency libssl dev on source install #45

Merged
merged 3 commits into from
Feb 8, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 133 additions & 0 deletions Vagrantfile.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<% config[:vagrantfiles].each do |vagrantfile| %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this vagrant template?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's explained on the PR @martinisoft:

test kitchen complained that it was missing.

I was unable to run integration tests without adding a vagrantfile, but I could not also find any reference to it. I have uninstalled any vagrant plugins in case it was that, but still had the problem.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@therobot You might have a global kitchen file in your ~/.kitchen/config.yml that might be referencing it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed that case too, but it was not there, I just found it here: .kitchen.local.yml

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@therobot That isn't tracked in git (it's ignored local kitchen configs) so I'd just add Vagrantfile.erb to the gitignore in this commit to resolve that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I deleted both Vagrantfile.erb and .kitchen.local.yml I don't think I need it @martinisoft

require "<%= vagrantfile %>"
<% end %>

Vagrant.configure("2") do |c|
c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
c.vm.box = "<%= config[:box] %>"

c.cache.scope = :box if Vagrant.has_plugin?("vagrant-cachier")

<% if config[:box_url] %>
c.vm.box_url = "<%= config[:box_url] %>"
<% end %>

<% if config[:box_version] %>
c.vm.box_version = "<%= config[:box_version] %>"
<% end %>

<% if config[:box_check_update] %>
c.vm.box_check_update = "<%= config[:box_check_update] %>"
<% end %>

<% if config[:vm_hostname] %>
c.vm.hostname = "<%= config[:vm_hostname] %>"
<% end %>

<% if config[:communicator] %>
c.vm.communicator = "<%= config[:communicator] %>"
<% end %>

<% if config[:guest] %>
c.vm.guest = "<%= config[:guest] %>"
<% end %>

<% if config[:communicator] %>
<% if config[:username] %>
c.<%= config[:communicator] %>.username = "<%= config[:username] %>"
<% end %>
<% if config[:password] %>
c.<%= config[:communicator] %>.password = "<%= config[:password] %>"
<% end %>
<% else %>
<% if config[:username] %>
c.ssh.username = "<%= config[:username] %>"
<% end %>
<% if config[:password] %>
c.ssh.password = "<%= config[:password] %>"
<% end %>
<% end %>

<% if config[:ssh_key] %>
c.ssh.private_key_path = "<%= config[:ssh_key] %>"
<% end %>
<% config[:ssh].each do |key, value| %>
c.ssh.<%= key %> = "<%= value %>"
<% end %>
<% if config[:winrm] %>
<% config[:winrm].each do |key, value| %>
c.winrm.<%= key %> = <%= value %>
<% end %>
<% end %>

<% Array(config[:network]).each do |opts| %>
c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
<% end %>

c.vm.synced_folder ".", "/vagrant", disabled: true
<% config[:synced_folders].each do |source, destination, options| %>
c.vm.synced_folder "<%= source %>", "<%= destination %>", <%= options %>
<% end %>

c.vm.provider :<%= config[:provider] %> do |p|
<% case config[:provider]
when "virtualbox", /^vmware_/
if config[:gui] == true || config[:gui] == false %>
p.gui = <%= config[:gui] %>
<% end
end %>
<% config[:customize].each do |key, value| %>
<% case config[:provider]
when "libvirt" %>
p.<%= key %> = <%= value%>
<% when "lxc" %>
<% if key == :container_name %>
p.container_name = <%= value == ":machine" ? value : "\"#{value}\"" %>
<% elsif key == :backingstore %>
p.backingstore = "<%= value %>"
<% elsif key == :backingstore_options %>
<% config[:customize][:backingstore_options].each do |opt, opt_val| %>
p.backingstore_option "--<%= opt %>", "<%= opt_val %>"
<% end %>
<% else %>
p.customize "<%= key %>", "<%= value %>"
<% end %>
<% when "managed" %>
<% if key == :server %>
p.server = "<%= value %>"
<% end %>
<% when "parallels" %>
p.customize ["set", :id, "--<%= key.to_s.gsub('_', '-') %>", "<%= value %>"]
<% when "rackspace" %>
p.<%= key %> = "<%= value%>"
<% when "softlayer" %>
<% if key == :disk_capacity %>
p.<%= key %> = <%= value %>
<% else %>
p.<%= key %> = "<%= value %>"
<% end %>
<% when "virtualbox" %>
p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
<% when /^vmware_/ %>
<% if key == :memory %>
<% unless config[:customize].include?(:memsize) %>
p.vmx["memsize"] = "<%= value %>"
<% end %>
<% elsif key == :cpus %>
<% unless config[:customize].include?(:numvcpus) %>
p.vmx["numvcpus"] = "<%= value %>"
<% end %>
<% else %>
p.vmx["<%= key %>"] = "<%= value %>"
<% end %>
<% when "openstack", "cloudstack" %>
<% if value.is_a? String %>
p.<%= key %> = "<%= value%>"
<% else %>
p.<%= key %> = <%= value%>
<% end %>
<% end %>
<% end %>
end

end
1 change: 1 addition & 0 deletions recipes/_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package 'pkg-config'
package 'libboost-all-dev'
package 'ragel'
package 'libssl-dev'

# Base install directory
pdns_basepath = node['pdns']['source']['path']
Expand Down