Skip to content

Commit

Permalink
Update to Ceph Kraken release
Browse files Browse the repository at this point in the history
Update packer config to use latest CentOS
  • Loading branch information
codenrhoden committed Mar 15, 2017
1 parent b1eeec5 commit 5050549
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
7 changes: 6 additions & 1 deletion ceph/cephconfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ fi

ceph-deploy mon create-initial
for x in $(seq 1 $NUM_NODES); do
ceph-deploy osd create --zap-disk ceph-server-$x:/dev/sdb
ssh ceph-server-$x sudo ceph-disk list /dev/sda | grep unknown
if [ $? -eq 0 ]; then
ceph-deploy osd create --zap-disk ceph-server-$x:/dev/sda
else
ceph-deploy osd create --zap-disk ceph-server-$x:/dev/sdb
fi
done
ceph-deploy admin localhost
6 changes: 2 additions & 4 deletions ceph/packer/http/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ repo --name=updates --baseurl=http://mirrors.usinternet.com/centos/7/updates/x86
%packages --ignoremissing
@core
bzip2
kernel-devel
kernel-headers
-ipw2100-firmware
-ipw2200-firmware
-ipw*-firmware
-iwl*-firmware
-ivtv-firmware
%end

Expand Down
1 change: 1 addition & 0 deletions ceph/packer/scripts/base.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
yum install -y epel-release ntp git
yum update -y
systemctl enable ntpd
systemctl start ntpd
2 changes: 1 addition & 1 deletion ceph/packer/scripts/ceph.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
yum install -y epel-release
yum install -y python-pip
pip install ceph-deploy
ceph-deploy install --all --release jewel localhost
ceph-deploy install --all --release kraken localhost
chown vagrant:vagrant ~vagrant/ceph-deploy-ceph.log
6 changes: 3 additions & 3 deletions ceph/packer/scripts/virtualbox.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
VBOX_VERSION=$(cat /home/vagrant/.vbox_version)

# required for VirtualBox 4.3.26
yum install -y bzip2
yum install -y kernel-devel kernel-headers make gcc

ln -s /usr/include/linux/version.h /lib/modules/$(uname -r)/build/include/linux/

cd /tmp
mount -o loop /home/vagrant/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
sh /mnt/VBoxLinuxAdditions.run
umount /mnt
rm -rf /home/vagrant/VBoxGuestAdditions_*.iso

4 changes: 2 additions & 2 deletions ceph/packer/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"disk_size": 40520,
"guest_os_type": "RedHat_64",
"http_directory": "http",
"iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284",
"iso_checksum": "27bd866242ee058b7a5754e83d8ee8403e216b93d130d800852a96f41c34d86a",
"iso_checksum_type": "sha256",
"iso_url": "http://mirrors.sonic.net/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso",
"iso_url": "http://mirrors.sonic.net/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso",
"ssh_username": "vagrant",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand Down

0 comments on commit 5050549

Please sign in to comment.