update default box to ubuntu/xenial64; add puppet
since Change-Id: I6617283afd798af37e64913b7865cea3c8a62aba the devstack installer no longer supports trusty and xenial does not have puppet installed by default Related-Bug: 1599531 Change-Id: Ic59a768983430149e3f3a4de65606d649bb17693
This commit is contained in:
parent
323306a8d9
commit
b4365bed49
|
@ -56,6 +56,9 @@ def configure_vm(name, vm, conf)
|
|||
end
|
||||
end
|
||||
|
||||
# puppet not installed by default in ubuntu-xenial
|
||||
vm.provision "shell", inline: "sudo apt-get install -y puppet"
|
||||
|
||||
# puppet provisioning
|
||||
vm.provision "puppet" do |puppet|
|
||||
puppet.manifests_path = "puppet/manifests"
|
||||
|
@ -106,11 +109,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
#
|
||||
# The boot time is long for these, so I recommend that you convert to a local
|
||||
# version as soon as you can.
|
||||
config.vm.box = conf['box_name'] || 'ubuntu/trusty64'
|
||||
config.vm.box = conf['box_name'] || 'ubuntu/xenial64'
|
||||
config.vm.box_url = conf['box_url'] if conf['box_url']
|
||||
|
||||
if Vagrant.has_plugin?("vagrant-cachier")
|
||||
config.cache.scope = :box
|
||||
# see https://github.com/fgrehm/vagrant-cachier/issues/175
|
||||
config.cache.synced_folder_opts = {
|
||||
owner: "_apt",
|
||||
group: "ubuntu",
|
||||
mount_options: ["dmode=777", "fmode=666"]
|
||||
}
|
||||
end
|
||||
|
||||
if Vagrant.has_plugin?("vagrant-proxyconf") && conf['proxy']
|
||||
|
|
Loading…
Reference in New Issue