Skip to content

Commit

Permalink
move python install to separate resource
Browse files Browse the repository at this point in the history
Signed-off-by: jtschelling <[email protected]>
  • Loading branch information
jtschelling committed Jun 16, 2020
1 parent b1bf8e8 commit e75b1b9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 41 deletions.
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache-2.0'
description 'Installs/Configures graphite'

version '1.3.0'
version '2.0.0'

supports 'ubuntu'
supports 'debian'
Expand Down
21 changes: 1 addition & 20 deletions recipes/carbon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,7 @@
include_recipe 'graphite::_user'
include_recipe 'graphite::_directories'

pyenv_user_install 'carbons_pyenv' do
user node['graphite']['user']
end

pyenv_python node['graphite']['pyenv']['python_version'] do
user node['graphite']['user']
end

pyenv_global node['graphite']['pyenv']['python_version'] do
user node['graphite']['user']
end

pyenv_pip 'virtualenv' do
user node['graphite']['user']
end

pyenv_script 'setup graphite virtualenv' do
code "virtualenv #{node['graphite']['base_dir']}"
user node['graphite']['user']
end
graphite_python 'carbons_python'

include_recipe 'graphite::_carbon_packages'
include_recipe 'graphite::_carbon_config'
21 changes: 1 addition & 20 deletions recipes/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,7 @@
include_recipe 'graphite::_user'
include_recipe 'graphite::_directories'

pyenv_user_install 'webs_pyenv' do
user node['graphite']['user']
end

pyenv_python node['graphite']['pyenv']['python_version'] do
user node['graphite']['user']
end

pyenv_global node['graphite']['pyenv']['python_version'] do
user node['graphite']['user']
end

pyenv_pip 'virtualenv' do
user node['graphite']['user']
end

pyenv_script 'setup graphite virtualenv' do
code "virtualenv #{node['graphite']['base_dir']}"
user node['graphite']['user']
end
graphite_python 'webs_python'

include_recipe 'graphite::_web_packages'

Expand Down
29 changes: 29 additions & 0 deletions resources/python.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
default_action :install

property :pyenv_name, String, name_property: true
property :python_version, String, default: '2.7.17'
property :user, String, default: lazy { node['graphite']['user'] }
property :graphite_dir, String, default: lazy { node['graphite']['base_dir'] }

action :install do
pyenv_user_install new_resource.pyenv_name do
user new_resource.user
end

pyenv_python new_resource.python_version do
user new_resource.user
end

pyenv_global new_resource.python_version do
user new_resource.user
end

pyenv_pip 'virtualenv' do
user new_resource.user
end

pyenv_script 'setup graphite virtualenv' do
code "virtualenv #{new_resource.graphite_dir}"
user new_resource.user
end
end

0 comments on commit e75b1b9

Please sign in to comment.