fix storage.yaml to write environments/storage/nova-nfs.yaml

753a350418 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 1c241362ff)
This commit is contained in:
Martin Schuppert 2019-04-18 13:43:50 +02:00
parent 63a7d6d92c
commit a32d703190
2 changed files with 6 additions and 1 deletions

View File

@ -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.

View File

@ -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: |