summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph10
1 files changed, 9 insertions, 1 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 604728c..a889214 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -214,6 +214,8 @@ function _get_ceph_version {
214 ceph_version_str=$(sudo ceph --version | cut -d ' ' -f 3 | \ 214 ceph_version_str=$(sudo ceph --version | cut -d ' ' -f 3 | \
215 cut -d '.' -f 1,2) 215 cut -d '.' -f 1,2)
216 elif [[ $1 == 'mon' ]]; then 216 elif [[ $1 == 'mon' ]]; then
217 # TODO(frickler): Find a better way to make sure that ceph-mon has started
218 sleep 5
217 ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | \ 219 ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | \
218 cut -d '"' -f 4 | cut -f 1,2 -d '.') 220 cut -d '"' -f 4 | cut -f 1,2 -d '.')
219 else 221 else
@@ -274,7 +276,7 @@ function check_os_support_ceph {
274 return 276 return
275 fi 277 fi
276 278
277 if [[ ! ${DISTRO} =~ (trusty|xenial|jessie|sid|rhel7) ]]; then 279 if [[ ! ${DISTRO} =~ (bionic|trusty|xenial|jessie|sid|rhel7) ]]; then
278 echo "WARNING: your distro $DISTRO does not provide \ 280 echo "WARNING: your distro $DISTRO does not provide \
279 (at least) the Firefly release. \ 281 (at least) the Firefly release. \
280 Please use Ubuntu Trusty or Fedora 27 (and higher)" 282 Please use Ubuntu Trusty or Fedora 27 (and higher)"
@@ -410,6 +412,8 @@ function configure_ceph {
410 elif [[ $INIT_SYSTEM == 'systemd' ]]; then 412 elif [[ $INIT_SYSTEM == 'systemd' ]]; then
411 sudo systemctl enable ceph-mon@$(hostname) 413 sudo systemctl enable ceph-mon@$(hostname)
412 sudo systemctl start ceph-mon@$(hostname) 414 sudo systemctl start ceph-mon@$(hostname)
415 # TODO(frickler): Find a better way to make sure that ceph-mon has started
416 sleep 5
413 else 417 else
414 sudo touch ${CEPH_DATA_DIR}/mon/ceph-$(hostname)/sysvinit 418 sudo touch ${CEPH_DATA_DIR}/mon/ceph-$(hostname)/sysvinit
415 sudo service ceph start mon.$(hostname) 419 sudo service ceph start mon.$(hostname)
@@ -935,6 +939,10 @@ function install_ceph {
935 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1" 939 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"
936 fi 940 fi
937 941
942 elif [[ $os_CODENAME =~ bionic ]]; then
943 # Ceph Luminous is available in Ubuntu bionic natively, no need to set up
944 # any additional repos
945 true
938 elif [ -f "$APT_REPOSITORY_FILE" ]; then 946 elif [ -f "$APT_REPOSITORY_FILE" ]; then
939 # Opt into Openstack CI provided package repo mirror 947 # Opt into Openstack CI provided package repo mirror
940 if [ -f "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)" ] ; then 948 if [ -f "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)" ] ; then