diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-18 17:23:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-18 17:23:04 +0000 |
| commit | 544894c3bc802fa107cb9d4de61a9f5c42869d39 (patch) | |
| tree | da227b7260a18b65c3a3d07595cde17fdeb898eb /lib | |
| parent | b09c163b900afb060fdf85e15e020b7e036befb6 (diff) | |
| parent | e36f790d036c0bfb5d7ed81d656f9bb1f5200a1a (diff) | |
Merge "Allow passing a device name to ceph"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 2 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py index 5490c6e9..a27d13f1 100644 --- a/lib/python/apex/deploy_settings.py +++ b/lib/python/apex/deploy_settings.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 d3beb60c..bd93aa78 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -207,6 +207,10 @@ openstack-config --set undercloud.conf DEFAULT undercloud_hostname "undercloud.$ sudo openstack-config --set /etc/ironic/ironic.conf disk_utils iscsi_verify_attempts 30 sudo openstack-config --set /etc/ironic/ironic.conf disk_partitioner check_device_max_retries 40 +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 |