Add fs065 for Undercloud FFU upgrade

This new featureset covers the FFU undercloud upgrade from
Train to Wallaby. It only spanws a Train undercloud, sets
up Wallaby repositories and upgrades the Undercloud to
Wallaby relying on the tripleo-upgrade role.

This patch also removes some conditionals in fs050 and fs065
which relied on end-of-life releases.

Change-Id: I78df47b1d6b1df99138c5ae9f94ae065019242ff

config/general_config/featureset050.yml

@@ -7,19 +7,9 @@ ssl_overcloud: false
 undercloud_check_sanity: true
 undercloud_upgrade_cleanup: true
 
-containerized_undercloud: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
+containerized_undercloud: true
 
-containerized_overcloud: >-
-  {% if release in ['newton', 'ocata', 'pike'] -%}
-  false
-  {%- else -%}
-  true
-  {%- endif -%}
+containerized_overcloud: true
 
 containerized_overcloud_upgrade: false
 containerized_undercloud_upgrade: true

config/general_config/featureset065.yml

@@ -0,0 +1,39 @@
+######################################################
+# FEATURESET065 - CONTAINERIZED UNDERCLOUD FFU UPGRADE
+# Based on featureset050
+######################################################
+
+ssl_overcloud: false
+undercloud_check_sanity: true
+undercloud_upgrade_cleanup: true
+
+containerized_undercloud: true
+
+containerized_overcloud: true
+
+containerized_overcloud_upgrade: false
+containerized_undercloud_upgrade: true
+
+undercloud_cloud_domain: "localdomain"
+undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
+
+# Tripleo-upgrade specific parameters
+ffu_undercloud_upgrade: true
+tripleo_ci: true
+use_oooq: true
+
+# Deactivate validations as there is no overcloud
+use_os_tempest: false
+test_ping: false
+
+# This enables TLS for the undercloud which will also make haproxy bind to the
+# configured public-vip and admin-vip.
+undercloud_generate_service_certificate: true
+undercloud_enable_swift_encryption: true
+
+# There is not enough space in the Undercloud <20GB
+undercloud_enable_validations: false
+
+undercloud_enable_paunch: false
+
+ephemeral_heat: "{{ (release not in ['train','ussuri','victoria']) | bool }}"

fs-matrix.py

@@ -55,6 +55,8 @@ features_map = {
     'overcloud_update': ['true', 'UPDoc', 'Overcloud Update (Minor Upgrade)'],
     'ffu_overcloud_upgrade': ['true', 'UPGff',
                               'Fast-forward Overcloud Upgrade'],
+    'ffu_undercloud_upgrade': ['true', 'UPGff',
+                               'Fast-forward Undercloud Upgrade'],
     'standalone_role': ['Standalone.yaml', 'Stdln', 'Standalone Deploy'],
     'test_ping': ['true', 'PingT', 'Ping and ssh tests'],
     'run_tempest': ['true', 'Temps', 'run Tempest'],