From 0fb8970bbd5e43c4241a384eeed9bce1232b88b5 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Thu, 18 Apr 2019 13:43:50 +0200 Subject: [PATCH] fix storage.yaml to write environments/storage/nova-nfs.yaml Also add quotes to the nfs version as they are required in the resulting nova-nfs.yaml . NOTE: partial cherry-pick as we only need the quotes fix in queens. Closes-Bug: #1825374 Change-Id: I209480f209e3a8841362ea619b1c9b073c89f338 (cherry picked from commit 693556f22388c4debb585213e0bb89d28b60c12e) (cherry picked from commit 27a454b7ad303569d650be29acfb232bfd340544) --- environments/storage/nova-nfs.yaml | 2 +- sample-env-generator/storage.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/storage/nova-nfs.yaml b/environments/storage/nova-nfs.yaml index fd92bc84b5..f2e8bc8a5f 100644 --- a/environments/storage/nova-nfs.yaml +++ b/environments/storage/nova-nfs.yaml @@ -19,7 +19,7 @@ parameter_defaults: # NFS version used for nova storage (when NovaNfsEnabled is true). Since NFSv3 does not support full locking a NFSv4 version need to be used. To not break current installations the default is the previous hard coded version 4. # Type: string - NovaNfsVersion: 4.2 + NovaNfsVersion: "4.2" # ****************************************************** # Static parameters - these are values that must be diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml index aa1894b9df..691711741c 100644 --- a/sample-env-generator/storage.yaml +++ b/sample-env-generator/storage.yaml @@ -88,7 +88,7 @@ environments: - NovaNfsVersion sample_values: NovaNfsEnabled: True - NovaNfsVersion: '4.2' + NovaNfsVersion: '"4.2"' static: - NovaNfsEnabled description: |