summaryrefslogtreecommitdiffstats
path: root/apex/settings
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-06-18 14:00:38 -0400
committerTim Rozet <trozet@redhat.com>2018-06-18 15:55:29 -0400
commit6b304d2e2d9addcf33ad7e7ce5481d37a6b8ee4e (patch)
treeda52f4bfa270a0c8c6c6363121259e03ea9c012b /apex/settings
parent83ef5ed70381583e1a419716cd9acbf9538074c6 (diff)
Fixes Ceph PG calculation
Baremetal deployments were failing because the ceph PG size was exceeding the max allowed. Virtual was still working because we lower the number of pools and pg/osd. This patch changes the values to a number which should work for both virtual and baremetal. Also includes a fix which adds the controllers back as OSDs and a few other cleanup issues. JIRA: APEX-614 JIRA: APEX-569 Change-Id: I2ad65727ecdcaa0454eb53d25e32b7f1a53cd3a4 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/settings')
-rw-r--r--apex/settings/deploy_settings.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 4f887ed0..29fe64fb 100644
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -26,11 +26,11 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
'os_version',
'l2gw',
'sriov',
- 'containers']
+ 'containers',
+ 'ceph_device']
OPT_DEPLOY_SETTINGS = ['performance',
'vsperf',
- 'ceph_device',
'yardstick',
'dovetail',
'odl_vpp_routing_node',
@@ -105,6 +105,8 @@ class DeploySettings(dict):
self['deploy_options'][req_set] = 'ovs'
elif req_set == 'ceph':
self['deploy_options'][req_set] = True
+ elif req_set == 'ceph_device':
+ self['deploy_options'][req_set] = '/dev/loop3'
elif req_set == 'odl_version':
self['deploy_options'][req_set] = \
constants.DEFAULT_ODL_VERSION