From 743da68d25a5cf90ea8dbcaa5e4f8092739e0c78 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 6 Sep 2019 16:06:17 +1200
Subject: [PATCH] Run multinode and undercloud jobs nova-less

None of these jobs actually use nova, so it should be possible to run
them without.

Depends-On: https://review.opendev.org/#/c/703038/

Change-Id: I472f8d146d865316da4066cc6845e23c8808c907
Blueprint: nova-less-deploy
---
 .../featureset-multinode-common.yml             | 15 ++++++++++++++-
 config/general_config/featureset027.yml         | 17 ++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/config/general_config/featureset-multinode-common.yml b/config/general_config/featureset-multinode-common.yml
index 36affa21b..7b0df5663 100644
--- a/config/general_config/featureset-multinode-common.yml
+++ b/config/general_config/featureset-multinode-common.yml
@@ -1,9 +1,22 @@
+# Run an undercloud without glance or nova
+undercloud_enable_nova: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein', 'train'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+step_glance_upload: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein', 'train'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
 # general multinode job configuration
 enable_vbmc: false
 gating_repo_enabled: true
 deploy_multinode: true
 step_overcloud_image: false
-step_glance_upload: true
 step_register: false
 hypervisor_wait: false
 network_isolation: false
diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml
index 8fb324963..79d079586 100644
--- a/config/general_config/featureset027.yml
+++ b/config/general_config/featureset027.yml
@@ -97,6 +97,14 @@ test_regex: ''
 # Enable tempest container
 undercloud_enable_tempest: true
 
+# Run an undercloud without glance or nova
+undercloud_enable_nova: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+
 # Run tempest in containers when at least undercloud is containerized
 tempest_format: >-
   {% if containerized_undercloud|bool -%}
@@ -123,15 +131,6 @@ tempest_whitelist: >-
 # default tempest tests for UC
 tempest_whitelist_uc:
   - 'tempest.api.identity'
-  - 'tempest.api.image.v2.test_images.BasicOperationsImagesTest'
-  - 'tempest.api.image.v2.test_images_tags_negative.ImagesTagsNegativeTest'
-  - 'tempest.api.image.v2.test_images_member_negative.ImagesMemberNegativeTest'
-  - 'tempest.api.compute.admin.test_flavors'
-  - 'tempest.api.compute.flavors'
-  - 'tempest.api.compute.keypairs'
-  - 'tempest.api.compute.admin.test_quotas'
-  - 'tempest.api.compute.admin.test_aggregates_negative'
-  - 'tempest.api.compute.security_groups'
   - 'tempest.api.network.test_networks'
   - 'tempest.api.network.test_networks_negative'
   - 'tempest.api.network.test_security_groups_negative'