From 54ed0aa7a16ce80f9cb4f4e1c8f6cf67dbf98b31 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 10 Aug 2018 07:08:24 -0500 Subject: [PATCH] Add roles dir in system-config to roles path This doesn't exist yet, but is coming in the needed-by patch. Add the roles dir in system-config to the roles path. Change-Id: If05f02e856598403d7f94edf5e6e52c5fa69e8e6 Needed-By: https://review.openstack.org/590753 --- .../spec_helper_acceptance.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 52a8003..abd95db 100755 --- a/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb +++ b/lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb @@ -16,13 +16,15 @@ end def setup_host(host) add_platform_foss_defaults(host, 'unix') + host.ssh_permit_user_environment() + host.add_env_var( + 'ANSIBLE_ROLES_PATH', "#{ENV['HOME']}/src/#{SYSTEM_CONFIG}/roles") if ENV['PUPPET_VERSION'] == '4' - host.ssh_permit_user_environment() host.add_env_var('PATH', '/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin/:/opt/puppetlabs/bin') - # The SSH connection needs to be closed in order to refresh the SSH environment changes. - # It will reopen the next time a host action starts. - host.close end + # The SSH connection needs to be closed in order to refresh the SSH environment changes. + # It will reopen the next time a host action starts. + host.close end def install_system_config(host)