diff --git a/.kitchen.yml b/.kitchen.yml index 9bed409..e829cde 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -7,6 +7,7 @@ driver: provisioner: name: chef_zero + require_chef_omnibus: 13 attributes: appdynamics: version: '4.1.3.1' @@ -27,6 +28,7 @@ provisioner: platforms: - name: ubuntu-12.04 + - name: ubuntu-16.04 - name: centos-6.7 - name: windows2012r2 driver_config: @@ -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' diff --git a/metadata.rb b/metadata.rb index 3538c6b..c96ad86 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/recipes/python_agent.rb b/recipes/python_agent.rb index dd78b24..37b466f 100644 --- a/recipes/python_agent.rb +++ b/recipes/python_agent.rb @@ -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