kitchen-ansible 0.0.30 → 0.0.31

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d4def5cead360b7cb91dbcaaddcbe28da905a5a1
4
- data.tar.gz: eba30ebe678d3a5ea90225a3a9175a979d52aa34
3
+ metadata.gz: dc8a4be57dae0540a9a055105c75aa38bdba33f2
4
+ data.tar.gz: 5b7347f91e3e9c0b983773104c0def495d5d0e25
5
5
  SHA512:
6
- metadata.gz: af56e57ddc2bc21c9de8617b9296a97b8ce1c61abb759babacd6791aebc39bdcbf6d974db1507ad1c192439315d20fe97ce069bef24de439e89ebb6e3be012c3
7
- data.tar.gz: 0b8bc51b45e127dbd05b89929e261993d13917845b4e4b28110ef3a63b123ac504289e77df40213c8d9dc7eac0cbc91ece992c8e0b040b7f2d231c8b537aa0c2
6
+ metadata.gz: 49d1c58b2e935b55b85f16962887669bb22d42237b803f4807f24e182ab78145cc72a5afd81f22792b47ab464b7b4262211a0e05d1141d026b58cba1d63eb8ed
7
+ data.tar.gz: 307050327540f928926716b9e466e3f21f3478afaf1eae568bc3152194b002f94b101fa11f1407ce3d3eb715dc67ed3448344123e435a278113b1a05826738a6
@@ -1,5 +1,5 @@
1
1
  module Kitchen
2
2
  module Ansible
3
- VERSION = "0.0.30"
3
+ VERSION = "0.0.31"
4
4
  end
5
5
  end
@@ -44,8 +44,8 @@ module Kitchen
44
44
  default_config :tags, []
45
45
  default_config :ansible_apt_repo, "ppa:ansible/ansible"
46
46
  default_config :ansible_yum_repo, "https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm"
47
- default_config :ansible_sles_repo, "http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo"
48
- default_config :python_sles_repo, "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo"
47
+ default_config :ansible_sles_repo, "http://download.opensuse.org/repositories/systemsmanagement/SLE_12/systemsmanagement.repo"
48
+ default_config :python_sles_repo, "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_12/devel:languages:python.repo"
49
49
  default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
50
50
  # Until we can truly make busser work without /opt/chef/embedded/bin/gem being installed, we still need Chef Omnibus
51
51
  # (Reference: https://github.com/neillturner/kitchen-ansible/issues/66 )
@@ -60,6 +60,7 @@ module Kitchen
60
60
  default_config :ansible_connection, 'local'
61
61
  default_config :update_package_repos, true
62
62
  default_config :require_ansible_source, false
63
+ default_config :ansible_source_rev, nil
63
64
  default_config :http_proxy, nil
64
65
  default_config :https_proxy, nil
65
66
  default_config :no_proxy, nil
@@ -345,7 +345,7 @@ module Kitchen
345
345
  fi
346
346
 
347
347
  #{export_http_proxy}
348
- git clone git://github.com/ansible/ansible.git --recursive #{config[:root_path]}/ansible
348
+ git clone git://github.com/ansible/ansible.git --recursive #{config[:root_path]}/ansible #{install_source_rev}
349
349
  #{sudo_env('easy_install')} pip
350
350
  #{sudo_env('pip')} install six paramiko PyYAML Jinja2 httplib2
351
351
  fi
@@ -658,7 +658,11 @@ module Kitchen
658
658
 
659
659
  def install_epel_repo
660
660
  config[:enable_yum_epel] ? sudo_env('yum install epel-release -y') : nil
661
- end
661
+ end
662
+
663
+ def install_source_rev
664
+ config[:ansible_source_rev] ? "--branch #{config[:ansible_source_rev]}" : nil
665
+ end
662
666
 
663
667
  def http_proxy
664
668
  config[:http_proxy]
@@ -10,8 +10,8 @@ require_ansible_repo | true | Set if using a ansible install from yum or apt rep
10
10
  ansible_apt_repo | "ppa:ansible/ansible" | apt repo. see https://launchpad.net /~ansible/+archive/ubuntu/ansible or rquillo/ansible
11
11
  ansible_yum_repo | https://download.fedoraproject.org /pub/epel/6/i386/epel-release-6-8.noarch.rpm | yum repo RH/Centos6
12
12
  ansible_binary_path | NULL | If specified this will override the location where kitchen tries to run ansible-playbook from. ie: (ansible_binary_path: /usr/local/bin )
13
- _for RH/Centos7 change to_ | http://dl.fedoraproject.org /pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm |
14
- enable_yum_epel | false | enable yum EPEL repo
13
+ _for RH/Centos7 change to_ | http://dl.fedoraproject.org /pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm |
14
+ enable_yum_epel | false | enable yum EPEL repo
15
15
  ansible_sles_repo | http://download.opensuse.org/repositories /systemsmanagement/SLE_12/systemsmanagement.repo | zypper suse ansible repo
16
16
  python_sles_repo | http://download.opensuse.org/repositories/devel: /languages:/python/SLE_12/devel:languages:python.repo | zypper suse python repo
17
17
  require_ansible_omnibus | false | Set if using omnibus ansible pip install
@@ -46,6 +46,7 @@ require_ruby_for_busser|false|install ruby to run busser for tests
46
46
  require_chef_for_busser|true|install chef to run busser for tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
47
47
  chef_bootstrap_url |https://www.getchef.com /chef/install.sh| the chef install
48
48
  require_ansible_source | false | Install Ansible from source using method described here: http://docs.ansible.com/intro_installation.html#running-from-source. Only works on Debian/Ubuntu at present.
49
+ ansible_source_rev | | Branch or Tag to install ansible source
49
50
 
50
51
  ## Configuring Provisioner Options
51
52
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-ansible
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.30
4
+ version: 0.0.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Neill Turner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-31 00:00:00.000000000 Z
11
+ date: 2015-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen