openstack/devstack-plugin-ceph
Code Issues Proposed changes

Merge "Support Ubuntu Bionic LTS release"

Browse Source
This commit is contained in:
Zuul
2018-12-05 14:18:39 +00:00
committed by Gerrit Code Review
parent 39de6df041 917f0bef81
commit eea5899815
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ceph
View File

@@ -214,6 +214,8 @@ function _get_ceph_version {
ceph_version_str=$(sudo ceph --version | cut -d ' ' -f 3 | \ ceph_version_str=$(sudo ceph --version | cut -d ' ' -f 3 | \
cut -d '.' -f 1,2) cut -d '.' -f 1,2)
elif [[ $1 == 'mon' ]]; then elif [[ $1 == 'mon' ]]; then
# TODO(frickler): Find a better way to make sure that ceph-mon has started
sleep 5
ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | \ ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | \
cut -d '"' -f 4 | cut -f 1,2 -d '.') cut -d '"' -f 4 | cut -f 1,2 -d '.')
else else
@@ -274,7 +276,7 @@ function check_os_support_ceph {
return return
fi fi
if [[ ! ${DISTRO} =~ (trusty|xenial|jessie|sid|rhel7) ]]; then if [[ ! ${DISTRO} =~ (bionic|trusty|xenial|jessie|sid|rhel7) ]]; then
echo "WARNING: your distro $DISTRO does not provide \ echo "WARNING: your distro $DISTRO does not provide \
(at least) the Firefly release. \ (at least) the Firefly release. \
Please use Ubuntu Trusty or Fedora 27 (and higher)" Please use Ubuntu Trusty or Fedora 27 (and higher)"
@@ -410,6 +412,8 @@ function configure_ceph {
elif [[ $INIT_SYSTEM == 'systemd' ]]; then elif [[ $INIT_SYSTEM == 'systemd' ]]; then
sudo systemctl enable ceph-mon@$(hostname) sudo systemctl enable ceph-mon@$(hostname)
sudo systemctl start ceph-mon@$(hostname) sudo systemctl start ceph-mon@$(hostname)
# TODO(frickler): Find a better way to make sure that ceph-mon has started
sleep 5
else else
sudo touch ${CEPH_DATA_DIR}/mon/ceph-$(hostname)/sysvinit sudo touch ${CEPH_DATA_DIR}/mon/ceph-$(hostname)/sysvinit
sudo service ceph start mon.$(hostname) sudo service ceph start mon.$(hostname)
@@ -935,6 +939,10 @@ function install_ceph {
CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1" CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"
fi fi
elif [[ $os_CODENAME =~ bionic ]]; then
# Ceph Luminous is available in Ubuntu bionic natively, no need to set up
# any additional repos
true
elif [ -f "$APT_REPOSITORY_FILE" ]; then elif [ -f "$APT_REPOSITORY_FILE" ]; then
# Opt into Openstack CI provided package repo mirror # Opt into Openstack CI provided package repo mirror
if [ -f "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)" ] ; then if [ -f "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)" ] ; then