From 8b300b8c440e082dd1d3bdd37b76b474d20401df Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Tue, 4 Aug 2020 11:56:19 +0200 Subject: [PATCH] Update vagrant box version Devstack master(Victoria) has dropped xenial distro, switch base box version to bionic. Bionic has puppet5 as default puppet version, which has faster puppet class running in parallel, so devstack and grenade repos were being checked out while /home/stack dir were still being created, impose puppet class ordering. Change-Id: I89af65ca8c53aa41407ed7e4ca0edef88daae3b9 --- Vagrantfile | 2 +- puppet/manifests/default.pp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index f271c0e..b39c943 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -110,7 +110,7 @@ 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/xenial64' + config.vm.box = conf['box_name'] || 'ubuntu/bionic64' config.vm.box_url = conf['box_url'] if conf['box_url'] if Vagrant.has_plugin?("vagrant-cachier") diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp index fd73d4a..4050715 100644 --- a/puppet/manifests/default.pp +++ b/puppet/manifests/default.pp @@ -6,4 +6,8 @@ node default { } include grenade include devstack + + Class['base'] -> Class['user::stack'] -> Class['user::vagrant'] + Class['user::stack'] -> Class['grenade'] + Class['user::stack'] -> Class['devstack'] }