From 7ac402fcc06bc6ef691f34a917f9d98a25c990d5 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 27 Sep 2018 08:32:14 -0600
Subject: [PATCH] Pull in instack-undercloud

For backwards compatibility on the job that runs on instack-undercloud,
we need to continue to pull in instack-undercloud and run it since we've
removed the tripleoclient integration.

Change-Id: I77ec88ad4ace718d529ef1824d82032031c4d1eb
Depends-On: https://review.openstack.org/#/c/588606/
Depends-On: https://review.openstack.org/#/c/605747/
Related-Blueprint: remove-instack-undercloud
---
 config/general_config/featureset003.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/config/general_config/featureset003.yml b/config/general_config/featureset003.yml
index 1173cd5fc..3f3acb042 100644
--- a/config/general_config/featureset003.yml
+++ b/config/general_config/featureset003.yml
@@ -3,8 +3,25 @@ ssl_overcloud: false
 undercloud_check_idempotency: true
 undercloud_check_sanity: false
 
+# in order to still support running this job on instack-undercloud, we need
+# to specify a different install command for >= Stein since we dropped the
+# python-tripleoclient integration
+undercloud_install_cmd: >-
+  {% if containerized_undercloud|bool or release in ['ocata', 'pike', 'queens', 'rocky'] -%}
+  openstack undercloud install
+  {%- else -%}
+  instack-undercloud
+  {%- endif -%}
+
+undercloud_rpm_dependencies: >-
+  {% if containerized_undercloud|bool or release in ['ocata', 'pike', 'queens', 'rocky'] -%}
+  python-tripleoclient
+  {%- else -%}
+  instack-undercloud python-tripleoclient
+  {%- endif -%}
+
 undercloud_install_cli_options: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% if release in ['rocky'] -%}
   --use-heat=False
   {%- endif -%}