From a32d703190a8fd6eec737ea7c3cc20d72b3f8364 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 753a3504184d966c63121ca95bc0135afbc83a75 removed ceph entries from sample-env-generator/storage.yaml which resulted in nova-nfs and cinder-netapp-config to be in the same section. Therefore environment_generator.py did not update the nova-nfs.yaml . Also add quotes to the nfs version as they are required in the resulting nova-nfs.yaml . Closes-Bug: #1825374 Change-Id: I209480f209e3a8841362ea619b1c9b073c89f338 (cherry picked from commit 1c241362ff8df360a27b4fc06af0203d4e461c1f) --- environments/storage/nova-nfs.yaml | 4 ++++ sample-env-generator/storage.yaml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/environments/storage/nova-nfs.yaml b/environments/storage/nova-nfs.yaml index b3a354c60e..f2e8bc8a5f 100644 --- a/environments/storage/nova-nfs.yaml +++ b/environments/storage/nova-nfs.yaml @@ -17,6 +17,10 @@ parameter_defaults: # Type: string NovaNfsShare: '' + # 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" + # ****************************************************** # Static parameters - these are values that must be # included in the environment but should not be changed. diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml index e7c132a063..e04eaf456a 100644 --- a/sample-env-generator/storage.yaml +++ b/sample-env-generator/storage.yaml @@ -53,12 +53,13 @@ environments: - NovaNfsVersion sample_values: NovaNfsEnabled: True - NovaNfsVersion: '4.2' + NovaNfsVersion: '"4.2"' static: - NovaNfsEnabled description: | Configure and include this environment to enable the use of an NFS share as the backend for Nova. + - name: storage/cinder-netapp-config title: Enable the Cinder NetApp Backend description: |