Merge "dev: Improve error checking for config check functions"
This commit is contained in:
commit
c9086d7d29
@ -233,17 +233,22 @@ function upgrade_kayobe_venv {
|
||||
|
||||
function is_deploy_image_built_locally {
|
||||
ipa_build_images=$(kayobe configuration dump --host controllers[0] --var-name ipa_build_images)
|
||||
[[ $ipa_build_images =~ ^true$ ]]
|
||||
to_bool "$ipa_build_images"
|
||||
}
|
||||
|
||||
function is_ironic_enabled {
|
||||
ironic_enabled=$(kayobe configuration dump --host controllers[0] --var-name kolla_enable_ironic)
|
||||
[[ $ironic_enabled =~ ^true$ ]]
|
||||
to_bool "$ironic_enabled"
|
||||
}
|
||||
|
||||
function is_overcloud_host_image_built_by_dib {
|
||||
overcloud_dib_build_host_images=$(kayobe configuration dump --host controllers[0] --var-name overcloud_dib_build_host_images)
|
||||
[[ $overcloud_dib_build_host_images =~ ^true$ ]]
|
||||
to_bool "$overcloud_dib_build_host_images"
|
||||
}
|
||||
|
||||
function is_cinder_enabled {
|
||||
flag="$(run_kayobe configuration dump --host controllers[0] --var-name kolla_enable_cinder)"
|
||||
to_bool "$flag"
|
||||
}
|
||||
|
||||
function environment_setup {
|
||||
@ -872,11 +877,6 @@ function to_bool {
|
||||
fi
|
||||
}
|
||||
|
||||
function is_cinder_enabled {
|
||||
flag="$(run_kayobe configuration dump --host controllers[0] --var-name kolla_enable_cinder)"
|
||||
to_bool "$flag"
|
||||
}
|
||||
|
||||
function configure_iptables {
|
||||
# NOTE(wszumski): adapted from the ironic devstack plugin, see:
|
||||
# https://github.com/openstack/ironic/blob/36e87dc5b472d79470b783fbba9ce396e3cbb96e/devstack/lib/ironic#L2132
|
||||
|
Loading…
Reference in New Issue
Block a user