From b37256471e5beafbc158f2ad9769680fe5e2c00c Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 15 Feb 2018 18:11:26 +0100 Subject: [PATCH] OVB: use "ipmi" driver instead of "pxe_ipmitool" for >= Queens The classic drivers (pxe_*, agent_* and iscsi_*) are deprecated in Queens and will be removed in Rocky. This change uses the new --driver argument to build-nodes-json to specify the driver to use. Change-Id: If51505c4cd53918200b65c75915e389adaddb200 --- roles/ovb-manage-stack/README.md | 3 +++ roles/ovb-manage-stack/defaults/main.yml | 7 +++++++ roles/ovb-manage-stack/tasks/ovb-create-stack.yml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/roles/ovb-manage-stack/README.md b/roles/ovb-manage-stack/README.md index 7d046f4a0..b89ad67ec 100644 --- a/roles/ovb-manage-stack/README.md +++ b/roles/ovb-manage-stack/README.md @@ -56,6 +56,9 @@ Parameters used the env.yaml file to create the OVB heat stack (See defaults/mai - registered_releases -- releases for which images should be available for the undercloud +- baremetal_driver -- ironic driver to use for overcloud nodes, 'pxe_ipmitool' + for < Queens, 'ipmi' for >= Queens + Dependencies ------------ diff --git a/roles/ovb-manage-stack/defaults/main.yml b/roles/ovb-manage-stack/defaults/main.yml index 2c9b37a82..9c3485a98 100644 --- a/roles/ovb-manage-stack/defaults/main.yml +++ b/roles/ovb-manage-stack/defaults/main.yml @@ -92,6 +92,13 @@ registered_releases: - rhos-11 - rhos-12 +baremetal_driver: >- + {% if release not in ['newton', 'ocata', 'pike'] -%} + "ipmi" + {%- else -%} + "pxe_ipmitool" + {%- endif -%} + # OVB environment clean up cleanup_stacks_keypairs: false cleanup_stacks_keypairs_script: cleanup-stacks-keypairs.sh.j2 diff --git a/roles/ovb-manage-stack/tasks/ovb-create-stack.yml b/roles/ovb-manage-stack/tasks/ovb-create-stack.yml index b3b7177c3..5142d0726 100644 --- a/roles/ovb-manage-stack/tasks/ovb-create-stack.yml +++ b/roles/ovb-manage-stack/tasks/ovb-create-stack.yml @@ -180,7 +180,7 @@ chdir={{ local_working_dir }} export OS_CLIENT_CONFIG_FILE="{{ local_working_dir }}/clouds.yaml"; export OS_CLOUD="{{ cloud_name}}"; - {{ ovb_dir }}/bin/build-nodes-json --env {{ local_working_dir }}/{{ prefix }}env.yaml + {{ ovb_dir }}/bin/build-nodes-json --env {{ local_working_dir }}/{{ prefix }}env.yaml --driver {{ baremetal_driver }} register: nodes_json - name: remove clouds.yaml file