From cd8e7bdaa20d784072fd273d15b28e4e1efb4f7b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 15 May 2019 15:10:19 -0700 Subject: [PATCH] Install puppet with ansible Do this so that we have one way to install puppet (the puppet-install role) and not multiple ways (including install_puppet.sh). This has become more important because we need to fix how we install puppet after upstream deleted the package repos and rather than double account everything we can do it once. Change-Id: Iec86a5423b053d4d02f8e0a74fea883d328b1945 --- .../spec_helper_acceptance.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb b/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb index abd95db..c0b24e5 100755 --- a/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb +++ b/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb @@ -11,7 +11,8 @@ def run_ansible(host) end def install_infra_puppet(host) - on host, "bash -x #{ENV['HOME']}/src/#{SYSTEM_CONFIG}/install_puppet.sh", :environment => ENV.to_hash + install_puppet_playbook = "#{ENV['HOME']}/src/#{SYSTEM_CONFIG}/playbooks/install_puppet.yaml" + on host, ".ansiblevenv/bin/ansible-playbook -i hosts -e '{\"puppet_install_version\":#{ENV['PUPPET_VERSION']}}' #{install_puppet_playbook}" end def setup_host(host)