From 011c7a4b750b11c138728e5537a6e8f65a5d43fa Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 14 Nov 2016 12:36:27 -0500 Subject: Allow passing a device name to ceph JIRA: APEX-347 Change-Id: Ibc6d141e20faf613e0f6314286b55aff01ce862e Signed-off-by: Dan Radez (cherry picked from commit e36f790d036c0bfb5d7ed81d656f9bb1f5200a1a) --- lib/python/apex/deploy_env.py | 2 +- lib/undercloud-functions.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py index 10b7831f..0d48bd88 100644 --- a/lib/python/apex/deploy_env.py +++ b/lib/python/apex/deploy_env.py @@ -21,7 +21,7 @@ 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', 'vpp'] diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 95122980..d0347428 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -217,6 +217,10 @@ if [[ "$net_isolation_enabled" == "TRUE" ]]; then fi +if [[ -n "${deploy_options_array['ceph_device']}" ]]; then + sed -i '/ExtraConfig/a\\ ceph::profile::params::osds: {\\x27${deploy_options_array['ceph_device']}\\x27: {}}' opnfv-environment.yaml +fi + sudo sed -i '/CephClusterFSID:/c\\ CephClusterFSID: \\x27$(cat /proc/sys/kernel/random/uuid)\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml sudo sed -i '/CephMonKey:/c\\ CephMonKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml sudo sed -i '/CephAdminKey:/c\\ CephAdminKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -- cgit 1.2.3-korg