Add override_base_ftp_folder to errata tool variants

JIRA: CWFCONF-5528

README.rst

@@ -141,6 +141,7 @@ Errata Tool.
         product_version: RHCEPH-4.0-RHEL-8
         rhel_variant: 8Base
         push_targets: []
+        override_ftp_base_folder: "8Base"
 
 errata_tool_cdn_repo
 --------------------

library/errata_tool_variant.py

@@ -75,6 +75,12 @@
      choices: [rhn_live, rhn_stage, cdn, cdn_stage, cdn_docker,
                cdn_docker_stage]
      required: true
+    override_ftp_base_folder:
+      description:
+        - Override the default base folder derived from Variant
+        - "example: 9Base"
+      required: false
+
 requirements:
   - "python >= 2.7"
   - "lxml"
@@ -159,10 +165,6 @@ def prepare_diff_data(before, after):
         item_name=after['name'],
         item_type='variant',
         keys_to_copy=[
-            # This field exists in ET but is not yet supported by
-            # this ansible module
-            'override_ftp_base_folder',
-
             # The params may contain one or other of these
             # but both are present in the before data
             'tps_stream',
@@ -211,6 +213,7 @@ def run_module():
         rhel_variant=dict(),
         tps_stream=dict(),
         push_targets=dict(type='list', required=True),
+        override_ftp_base_folder=dict(),
     )
     module = AnsibleModule(
         argument_spec=module_args,

tests/fixtures/8Base-RHCEPH-4.0-Tools.variant.json

@@ -10,6 +10,7 @@
         "enabled": true,
         "buildroot": false,
         "tps_stream": "RHEL-8-Main-Base",
+        "override_ftp_base_folder": "8Base",
         "relationships": {
           "product": {
             "id": 104,

tests/fixtures/8Base.variant.json

@@ -9,6 +9,7 @@
         "cpe": "",
         "enabled": true,
         "buildroot": false,
+        "override_ftp_base_folder": "8Base",
         "relationships": {
           "product": {
             "id": 16,

tests/test_errata_tool_variant.py

@@ -33,6 +33,7 @@ def params():
         'push_targets': ['cdn'],
         'buildroot': False,
         'product_version': 'RHCEPH-4.0-RHEL-8',
+        'override_ftp_base_folder': '8Base',
     }
 
 
@@ -55,6 +56,7 @@ def test_create_variant(self, client, params):
                 'product_version': 'RHCEPH-4.0-RHEL-8',
                 'push_targets': ['cdn'],
                 'buildroot': False,
+                'override_ftp_base_folder': '8Base',
             }
         }
         assert history[0].json() == expected