From 4f81d911c4406867305671269536dc1d4529f975 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Mon, 2 Dec 2019 11:00:57 +0100
Subject: [PATCH] Fix OctaviaFlavorId type

The OctaviaFlavorId parameter type has two types set. This is due to a
bad rebase in https://review.opendev.org/#/c/685362/

Change-Id: I81da15c258efe43cc11fdfb5801eee1b5ada54b2
---
 puppet/services/octavia-controller.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/puppet/services/octavia-controller.yaml b/puppet/services/octavia-controller.yaml
index 61dbb59af3..46307a1c3e 100644
--- a/puppet/services/octavia-controller.yaml
+++ b/puppet/services/octavia-controller.yaml
@@ -51,7 +51,6 @@ parameters:
     description: Nova flavor ID to be used when creating the nova flavor for
                  amphora.
     type: string
-    type: number
   OctaviaConnectionMaxRetries:
     default: 120
     description: Retry threshold for connecting to amphorae.