Remove python_runtime references
In Chef 13+, resource duplication behaves differently. By centralizing python_runtime to openstack-common, the resource executes once in a given Chef run, instead of attempting to reinstall python multiple times. Change-Id: I2e17d655c86fac63e02aaadf5321bc95e2c7aa0b
This commit is contained in:
parent
d828493fad
commit
0064d8955e
|
@ -20,12 +20,6 @@ include_recipe 'openstack-dashboard::horizon'
|
||||||
django_path = node['openstack']['dashboard']['django_path']
|
django_path = node['openstack']['dashboard']['django_path']
|
||||||
policy_file_path = node['openstack']['dashboard']['policy_files_path']
|
policy_file_path = node['openstack']['dashboard']['policy_files_path']
|
||||||
|
|
||||||
# use system python for fwaas dashboard
|
|
||||||
python_runtime '2' do
|
|
||||||
provider :system
|
|
||||||
version '2.7'
|
|
||||||
end
|
|
||||||
|
|
||||||
python_package 'neutron-fwaas-dashboard'
|
python_package 'neutron-fwaas-dashboard'
|
||||||
|
|
||||||
%w(
|
%w(
|
||||||
|
|
|
@ -19,11 +19,6 @@ include_recipe 'openstack-dashboard::horizon'
|
||||||
|
|
||||||
django_path = node['openstack']['dashboard']['django_path']
|
django_path = node['openstack']['dashboard']['django_path']
|
||||||
|
|
||||||
# use system python for lbaasv2 dashboard
|
|
||||||
python_runtime '2' do
|
|
||||||
provider :system
|
|
||||||
end
|
|
||||||
|
|
||||||
python_package 'neutron-lbaas-dashboard' do
|
python_package 'neutron-lbaas-dashboard' do
|
||||||
version node['openstack']['dashboard']['lbaas']['version']
|
version node['openstack']['dashboard']['lbaas']['version']
|
||||||
notifies :run, 'execute[restore-selinux-context]', :immediately
|
notifies :run, 'execute[restore-selinux-context]', :immediately
|
||||||
|
|
|
@ -16,10 +16,6 @@ describe 'openstack-dashboard::neutron-fwaas-dashboard' do
|
||||||
expect(chef_run).to include_recipe('openstack-dashboard::horizon')
|
expect(chef_run).to include_recipe('openstack-dashboard::horizon')
|
||||||
end
|
end
|
||||||
|
|
||||||
it do
|
|
||||||
expect(chef_run).to install_python_runtime('2')
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
it do
|
||||||
expect(chef_run).to install_python_package('neutron-fwaas-dashboard')
|
expect(chef_run).to install_python_package('neutron-fwaas-dashboard')
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,10 +16,6 @@ describe 'openstack-dashboard::neutron-lbaas-dashboard' do
|
||||||
expect(chef_run).to include_recipe('openstack-dashboard::horizon')
|
expect(chef_run).to include_recipe('openstack-dashboard::horizon')
|
||||||
end
|
end
|
||||||
|
|
||||||
it do
|
|
||||||
expect(chef_run).to install_python_runtime('2')
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
it do
|
||||||
expect(chef_run).to install_python_package('neutron-lbaas-dashboard')
|
expect(chef_run).to install_python_package('neutron-lbaas-dashboard')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue