From 0a63a77f54d8c92aed604b83d043d0ce3ccb07e8 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 27 Sep 2018 08:22:04 -0600
Subject: [PATCH] Add ability to specify undercloud install command

In Stein we've dropped the undercloud install via instack so we need to
be able to override the command so that we can properly continue
testing instack-undercloud.

Change-Id: Ic13488cbebe2ec5fb3a60f04898c3af12280d62c
Related-Blueprint: remove-instack-undercloud
---
 roles/undercloud-deploy/README.md                          | 1 +
 roles/undercloud-deploy/defaults/main.yml                  | 1 +
 roles/undercloud-deploy/templates/undercloud-install.sh.j2 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md
index a1f0f4e55..d96754112 100644
--- a/roles/undercloud-deploy/README.md
+++ b/roles/undercloud-deploy/README.md
@@ -39,6 +39,7 @@ user sessions to provide greater flexixiblity to our users. ** additional docume
 https://docs.openstack.org/tripleo-quickstart/latest/accessing-libvirt.html
 - `undercloud_conf_extra`: <''> -- extra options to be added to ~/undercloud.conf
 - `undercloud_extra_args`: <''> -- extra options for undercloud deploy command.
+- `undercloud_install_cmd`: <'openstack undercloud install'> -- command used to install the undercloud
 - `undercloud_install_cli_options`: <''> -- extra options for undercloud install command.
 - `undercloud_enable_mistral`: <'true'> -- sets up the 'enable_mistral' option
   in undercloud.conf.
diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml
index 254378465..e82d3dcb8 100644
--- a/roles/undercloud-deploy/defaults/main.yml
+++ b/roles/undercloud-deploy/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 
 undercloud_config_file: undercloud.conf.j2
+undercloud_install_cmd: openstack undercloud install
 undercloud_install_cli_options: ""
 undercloud_post_install_script: undercloud-install-post.sh.j2
 undercloud_install_log: "{{ working_dir }}/undercloud_install.log"
diff --git a/roles/undercloud-deploy/templates/undercloud-install.sh.j2 b/roles/undercloud-deploy/templates/undercloud-install.sh.j2
index bc250f9c4..cdb831309 100644
--- a/roles/undercloud-deploy/templates/undercloud-install.sh.j2
+++ b/roles/undercloud-deploy/templates/undercloud-install.sh.j2
@@ -11,6 +11,6 @@ set -eux
 export {{ var }}
 {% endfor %}
 
-openstack undercloud install {{ undercloud_install_cli_options }}
+{{ undercloud_install_cmd }} {{ undercloud_install_cli_options }}
 
 ### --stop_docs