From c35df2f7c3e117e02ed0577b08ed03da43504ce3 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Thu, 28 Jan 2021 17:31:20 +0530
Subject: [PATCH] Don't use swift backend for introspection data

This adds a new tht parameter to set introspection
data storage backend.

As we plan to remove swift from undercloud, we change
this to database for it.

Change-Id: Icc8a9e2c80660b0dcc29a75183550917667d030c
---
 .../ironic-inspector-container-puppet.yaml    | 28 +++++++++++++++++--
 environments/undercloud.yaml                  |  2 ++
 ...ageBackend-parameter-9dd87e751b576007.yaml |  9 ++++++
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/add-IronicInspectorStorageBackend-parameter-9dd87e751b576007.yaml

diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index 720cf967a4..483dd9ea80 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -150,8 +150,16 @@ parameters:
     default: {}
   IronicInspectorUseSwift:
     default: true
-    description: Whether to use Swift for storing introspection data.
+    description: |
+      DEPRECATED: Use IronicInspectorStorageBackend instead.
+      Whether to use Swift for storing introspection data.
     type: boolean
+  IronicInspectorStorageBackend:
+    default: 'none'
+    description: Storage backend for storing introspection data.
+    type: string
+    constraints:
+      - allowed_values: ['none', 'swift', 'database']
   IronicIPXEPort:
     default: 8088
     description: Port to use for serving images when iPXE is used.
@@ -176,9 +184,23 @@ parameters:
                '2001:db8::/64': 'physnet_b'
     type: json
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - IronicInspectorIpRange
+  - IronicInspectorUseSwift
+
 conditions:
   enable_ipxe: {equals : [{get_param: IronicInspectorIPXEEnabled}, true]}
-  use_swift: {equals : [{get_param: IronicInspectorUseSwift}, true]}
+  use_swift:
+    or:
+      - equals: [{get_param: IronicInspectorUseSwift}, true]
+      - equals: [{get_param: IronicInspectorStorageBackend}, 'swift']
   enable_node_discovery: {equals : [{get_param: IronicInspectorEnableNodeDiscovery}, true]}
   ironic_inspection_subnets_not_set: {equals : [{get_param: IronicInspectorSubnets}, {}]}
   enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
@@ -336,7 +358,7 @@ outputs:
               ironic::inspector::swift::user_domain_name: 'Default'
               ironic::inspector::swift::project_domain_name: 'Default'
               ironic::inspector::swift::region_name: {get_param: KeystoneRegion}
-            - {}
+            - ironic::inspector::store_data: {get_param: IronicInspectorStorageBackend}
           -
             if:
             - enable_node_discovery
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 920c188391..7716df0534 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -131,6 +131,8 @@ parameter_defaults:
   IronicInspectorInterface: br-ctlplane
   # IronicInspectorSubnets:
   #   - ip_range: '192.168.24.100,192.168.24.200'
+  IronicInspectorUseSwift: false
+  IronicInspectorStorageBackend: 'database'
   IronicProvisioningNetwork: 'ctlplane'
   IronicRescuingNetwork: 'ctlplane'
   NeutronServicePlugins: router,segments
diff --git a/releasenotes/notes/add-IronicInspectorStorageBackend-parameter-9dd87e751b576007.yaml b/releasenotes/notes/add-IronicInspectorStorageBackend-parameter-9dd87e751b576007.yaml
new file mode 100644
index 0000000000..68eed5e85d
--- /dev/null
+++ b/releasenotes/notes/add-IronicInspectorStorageBackend-parameter-9dd87e751b576007.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Adds a new ``IronicInspectorStorageBackend`` parameter that can be used
+    to set the storage backend for introspection data.
+deprecations:
+  - |
+    The ``IronicInspectorUseSwift`` parameter has been deprecated in favor of
+    ``IronicInspectorStorageBackend`` and will be removed in a future release.