Skip to content

Commit

Permalink
require_ansible_source currently broken #126
Browse files Browse the repository at this point in the history
  • Loading branch information
neillturner committed Jan 23, 2016
1 parent b6db0e8 commit 847d251
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/kitchen-ansible/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
module Kitchen
module Ansible
VERSION = '0.0.36'
VERSION = '0.0.37'
end
end
6 changes: 5 additions & 1 deletion lib/kitchen/provisioner/ansible_playbook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def install_ansible_from_source_command
<<-INSTALL
if [ ! -d #{config[:root_path]}/ansible ]; then
if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
#{install_epel_repo}
#{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
#{update_packages_redhat_cmd}
#{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev
else
Expand Down Expand Up @@ -579,6 +579,10 @@ def update_packages_redhat_cmd
Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).update_packages_command
end

def python_sles_repo
config[:python_sles_repo]
end

def extra_vars
bash_vars = config[:extra_vars]
if config.key?(:attributes) && config[:attributes].key?(:extra_vars) && config[:attributes][:extra_vars].is_a?(Hash)
Expand Down

0 comments on commit 847d251

Please sign in to comment.