Skip to content

Chef 13 compatibility #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Chef 13 compatibility #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a08f4e6
Chef 13 compatibility
trivoallan Aug 25, 2017
3bbf2b1
Force Chef 13 for kitchen tests
trivoallan Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ driver:

provisioner:
name: chef_zero
require_chef_omnibus: 13
attributes:
appdynamics:
version: '4.1.3.1'
Expand All @@ -27,6 +28,7 @@ provisioner:

platforms:
- name: ubuntu-12.04
- name: ubuntu-16.04
- name: centos-6.7
- name: windows2012r2
driver_config:
Expand Down Expand Up @@ -59,10 +61,10 @@ suites:
- name: python_agent
run_list:
- recipe[apt::default]
- recipe[python::default]
- recipe[appdynamics::python_agent]
attributes:
appdynamics:
version: '4.3.9.0'
python_agent:
debug: true
dir: '/opt/pyagent'
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
issues_url 'https://github.com/appdynamics/appdynamics-cookbooks/issues' if respond_to?(:issues_url)

depends 'windows', '~> 1.44.3'
depends 'python', '~> 1.4.6'
depends 'poise-python', '~> 1.6.0'
depends 'nodejs', '~> 2.4.4'
depends 'java', '~> 1.42.0'
depends 'apt', '~> 3.0.0'
Expand Down
10 changes: 7 additions & 3 deletions recipes/python_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
agent_version = agent['version'] || node['appdynamics']['version']
fail 'You must specify either node[\'appdynamics\'][\'version\'] or node[\'appdynamics\'][\'python_agent\'][\'version\']' unless agent_version

python_pip 'appdynamics' do
python_runtime 'appdynamics' do
version '3'
end

python_package 'appdynamics' do
virtualenv agent['virtualenv'] if agent['virtualenv']
python 'appdynamics' if not agent['virtualenv']
action agent['action']
version agent_version
user agent['user']
group agent['group']
options '--pre' if agent['prerelease']
install_options '--pre' if agent['prerelease']
end

template agent['config_file'] do
Expand Down