Add default_python_interpreter parameter to ansible manifest
This patch adds the possibility to configure the parameter "default_python_interpreter" for the ansible deploy interface in the "ironic::drivers::ansible" manifest. Change-Id: Ie886ee8954cc813e06cd81d4b4c7bdb0bb1a4094
This commit is contained in:
parent
5c82a0241a
commit
1b55f884a3
@ -62,6 +62,9 @@
|
|||||||
# cleaning.
|
# cleaning.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*default_python_interpreter*]
|
||||||
|
# (optional) Absolute path to the python interpreter on the managed machines.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
|
||||||
class ironic::drivers::ansible (
|
class ironic::drivers::ansible (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
@ -75,6 +78,7 @@ class ironic::drivers::ansible (
|
|||||||
$default_shutdown_playbook = $::os_service_default,
|
$default_shutdown_playbook = $::os_service_default,
|
||||||
$default_clean_playbook = $::os_service_default,
|
$default_clean_playbook = $::os_service_default,
|
||||||
$default_clean_steps_config = $::os_service_default,
|
$default_clean_steps_config = $::os_service_default,
|
||||||
|
$default_python_interpreter = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ironic::deps
|
include ::ironic::deps
|
||||||
@ -92,6 +96,7 @@ class ironic::drivers::ansible (
|
|||||||
'ansible/default_shutdown_playbook': value => $default_shutdown_playbook;
|
'ansible/default_shutdown_playbook': value => $default_shutdown_playbook;
|
||||||
'ansible/default_clean_playbook': value => $default_clean_playbook;
|
'ansible/default_clean_playbook': value => $default_clean_playbook;
|
||||||
'ansible/default_clean_steps_config': value => $default_clean_steps_config;
|
'ansible/default_clean_steps_config': value => $default_clean_steps_config;
|
||||||
|
'ansible/default_python_interpreter': value => $default_python_interpreter;
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_packages('ansible',
|
ensure_packages('ansible',
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Allow configuring the ``default_python_interpreter`` parameter for the
|
||||||
|
ansible deploy interface in the ``ironic::drivers::ansible`` manifest.
|
@ -37,6 +37,7 @@ describe 'ironic::drivers::ansible' do
|
|||||||
is_expected.to contain_ironic_config('ansible/default_shutdown_playbook').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('ansible/default_shutdown_playbook').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_ironic_config('ansible/default_clean_playbook').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('ansible/default_clean_playbook').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_ironic_config('ansible/default_clean_steps_config').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('ansible/default_clean_steps_config').with_value('<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_ironic_config('ansible/default_python_interpreter').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'installs ansible package' do
|
it 'installs ansible package' do
|
||||||
@ -63,7 +64,8 @@ describe 'ironic::drivers::ansible' do
|
|||||||
:default_deploy_playbook => 'deploy-extra.yaml',
|
:default_deploy_playbook => 'deploy-extra.yaml',
|
||||||
:default_shutdown_playbook => 'shutdown-extra.yaml',
|
:default_shutdown_playbook => 'shutdown-extra.yaml',
|
||||||
:default_clean_playbook => 'clean-extra.yaml',
|
:default_clean_playbook => 'clean-extra.yaml',
|
||||||
:default_clean_steps_config => 'custom-clean-steps.yaml')
|
:default_clean_steps_config => 'custom-clean-steps.yaml',
|
||||||
|
:default_python_interpreter => '/usr/bin/python3')
|
||||||
end
|
end
|
||||||
it 'should replace default parameter with new value' do
|
it 'should replace default parameter with new value' do
|
||||||
is_expected.to contain_ironic_config('ansible/ansible_extra_args').with_value(p[:ansible_extra_args])
|
is_expected.to contain_ironic_config('ansible/ansible_extra_args').with_value(p[:ansible_extra_args])
|
||||||
@ -76,6 +78,7 @@ describe 'ironic::drivers::ansible' do
|
|||||||
is_expected.to contain_ironic_config('ansible/default_shutdown_playbook').with_value(p[:default_shutdown_playbook])
|
is_expected.to contain_ironic_config('ansible/default_shutdown_playbook').with_value(p[:default_shutdown_playbook])
|
||||||
is_expected.to contain_ironic_config('ansible/default_clean_playbook').with_value(p[:default_clean_playbook])
|
is_expected.to contain_ironic_config('ansible/default_clean_playbook').with_value(p[:default_clean_playbook])
|
||||||
is_expected.to contain_ironic_config('ansible/default_clean_steps_config').with_value(p[:default_clean_steps_config])
|
is_expected.to contain_ironic_config('ansible/default_clean_steps_config').with_value(p[:default_clean_steps_config])
|
||||||
|
is_expected.to contain_ironic_config('ansible/default_python_interpreter').with_value(p[:default_python_interpreter])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user