From a2324ccac845933a03672739fbb833043e838c06 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 27 Oct 2020 13:47:44 +0900
Subject: [PATCH] Cleanup unused parameters from nova templates

This patch removes the parameters in nova templates, which has had
no effect recently. This also removes the unused ContainerCli in
parameter definitions.

Change-Id: I173e5ae5a377d633dddce185dff11ea7e2f3bada
---
 deployment/nova/nova-api-container-puppet.yaml             | 4 ----
 deployment/nova/nova-base-puppet.yaml                      | 4 ----
 deployment/nova/nova-libvirt-container-puppet.yaml         | 6 ------
 .../notes/cleanup-nova-params-cc7c501dcb9879d0.yaml        | 7 +++++++
 4 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/cleanup-nova-params-cc7c501dcb9879d0.yaml

diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 7e2c3d9d9e..29c19f3519 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -50,10 +50,6 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
-  NovaDbSyncTimeout:
-    default: 300
-    description: Timeout for Nova db sync
-    type: number
   NovaPassword:
     description: The password for the nova service and db account
     type: string
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index d9fa5ce5f3..dde8e9d866 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -55,10 +55,6 @@ parameters:
     description: >
         Endpoint interface to be used for the placement API.
     default: 'internal'
-  ExtractedPlacementEnabled:
-    type: boolean
-    description: Set to True when deploying the extracted Placement service.
-    default: False
   NovaOVSBridge:
     default: 'br-int'
     description: Name of integration bridge used by Open vSwitch
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 738e1cec92..8b3beefa3d 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -176,12 +176,6 @@ parameters:
     tags:
       - role_specific
 
-  ContainerCli:
-    type: string
-    default: 'podman'
-    description: CLI tool used to manage containers.
-    constraints:
-      - allowed_values: ['docker', 'podman']
   NovaComputeLibvirtType:
     type: string
     default: kvm
diff --git a/releasenotes/notes/cleanup-nova-params-cc7c501dcb9879d0.yaml b/releasenotes/notes/cleanup-nova-params-cc7c501dcb9879d0.yaml
new file mode 100644
index 0000000000..dc029d9cb8
--- /dev/null
+++ b/releasenotes/notes/cleanup-nova-params-cc7c501dcb9879d0.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The following parameters have been removed since they have had no effect.
+
+    - ``NovaDbSyncTimeout``
+    - ``ExtractedPlacementEnabled``