Merge "Renames 'usable_ip_range' to 'overcloud_ip_range'"

[apex.git] / lib / python / apex / deploy_settings.py

diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index b70efda..a27d13f 100644 (file)
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -21,10 +21,10 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
                        'vpn',
                        'vpp']
 
-OPT_DEPLOY_SETTINGS = ['performance', 'vsperf']
+OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', 'ceph_device']
 
 VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
-VALID_PERF_OPTS = ['kernel', 'nova']
+VALID_PERF_OPTS = ['kernel', 'nova', 'vpp']
 VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio']
 
 
@@ -40,7 +40,7 @@ class DeploySettings(dict):
         init_dict = {}
         if type(filename) is str:
             with open(filename, 'r') as deploy_settings_file:
-                init_dict = yaml.load(deploy_settings_file)
+                init_dict = yaml.safe_load(deploy_settings_file)
         else:
             # assume input is a dict to build from
             init_dict = filename