From cbc159b97923da0e8ebe96c7db8d23c4db0220bd Mon Sep 17 00:00:00 2001 From: lub Date: Sat, 7 Dec 2019 21:37:42 +0100 Subject: [PATCH] adjust node.sh for overlay network --- bootstrap.sh | 3 ++- node.sh | 42 ++++++++++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 96cb7fc..b13cfa2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -38,8 +38,9 @@ docker run -d --rm --net=ceph --hostname $(hostname) --privileged -v /ceph/osd01 mkdir -p /ceph/mds/etc/ceph/ /ceph/mds/var/lib/ceph/bootstrap-mds (docker exec ceph_mon ceph config generate-minimal-conf) > /ceph/mds/etc/ceph/ceph.conf cp -a /ceph/mon/etc/ceph/ceph.client.admin.keyring /ceph/mds/etc/ceph/ -docker run -d --rm --net=ceph --hostname $(hostname) -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds +docker run --rm --net=ceph --hostname $(hostname) -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds rm /ceph/mds/etc/ceph/ceph.client.admin.keyring +docker run -d --rm --net=ceph --hostname $(hostname) -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds #set cephfs autoscaling docker exec ceph_mon ceph mgr module enable pg_autoscaler diff --git a/node.sh b/node.sh index c57b034..0df6f09 100755 --- a/node.sh +++ b/node.sh @@ -2,36 +2,50 @@ #mon -#copy ceph.conf,ceph.client.admin.keyring,ceph.mon.keyring manually to /ceph/mon/etc/ceph -docker run -d --rm --net=host -v /ceph/mon/etc/ceph:/etc/ceph -v /ceph/mon/var/lib/ceph:/var/lib/ceph -e MON_IP=10.13.37.3 -e CEPH_PUBLIC_NETWORK=10.13.37.0/22 -e CEPH_CLUSTER_NETWORK=10.13.37.0/22 --name ceph_mon docker.io/ceph/daemon:latest-nautilus mon +#on existing node: +docker exec ceph_mon ceph config generate-minimal-conf +cat /ceph/mon/etc/ceph/ceph.mon.keyring +cat /ceph/mon/etc/ceph/ceph.client.admin.keyring +#copy ceph.conf, ceph.client.admin.keyring, ceph.mon.keyring manually to /ceph/mon/etc/ceph on new node +mkdir -p /ceph/mon/etc/ceph +chmod 600 /ceph/mon/etc/ceph/ceph.mon.keyring /ceph/mon/etc/ceph/ceph.client.admin.keyring +ip='10.13.37.4' +docker run -d --rm --net=ceph --hostname $(hostname) -v /ceph/mon/etc/ceph:/etc/ceph -v /ceph/mon/var/lib/ceph:/var/lib/ceph --ip "$ip" -e MON_IP="$ip" -e CEPH_PUBLIC_NETWORK=10.13.37.0/23 -e CEPH_CLUSTER_NETWORK=10.13.37.0/23 --name ceph_mon docker.io/ceph/daemon:latest-nautilus mon #mgr -mkdir -p /ceph/mgr/etc/ceph/ -cp -a /ceph/mon/etc/ceph/ceph.conf /ceph/mon/etc/ceph/ceph.client.admin.keyring /ceph/mgr/etc/ceph/ -docker run -d --rm --net=host -v /ceph/mgr/etc/ceph:/etc/ceph -v /ceph/mgr/var/lib/ceph:/var/lib/ceph --name ceph_mgr docker.io/ceph/daemon:latest-nautilus mgr +mkdir -p /ceph/mgr/etc/ceph/ +(docker exec ceph_mon ceph config generate-minimal-conf) > /ceph/mgr/etc/ceph/ceph.conf +cp -a /ceph/mon/etc/ceph/ceph.client.admin.keyring /ceph/mgr/etc/ceph/ +docker run --rm --net=ceph --hostname $(hostname) -v /ceph/mgr/etc/ceph:/etc/ceph -v /ceph/mgr/var/lib/ceph:/var/lib/ceph --name ceph_mgr docker.io/ceph/daemon:latest-nautilus mgr +rm /ceph/mgr/etc/ceph/ceph.client.admin.keyring +docker run -d --rm --net=ceph --hostname $(hostname) -v /ceph/mgr/etc/ceph:/etc/ceph -v /ceph/mgr/var/lib/ceph:/var/lib/ceph --name ceph_mgr docker.io/ceph/daemon:latest-nautilus mgr #osd mkdir -p /ceph/osd_sdb/etc/ceph/ /ceph/osd_sdb/var/lib/ceph/bootstrap-osd /ceph/osd_sdb/var/lib/ceph/osd (docker exec ceph_mon ceph auth get client.bootstrap-osd) > /ceph/osd_sdb/var/lib/ceph/bootstrap-osd/ceph.keyring -cp -a /ceph/mon/etc/ceph/ceph.conf /ceph/osd_sdb/etc/ceph/ -docker run --rm --net=host --privileged -v /ceph/osd_sdb/etc/ceph:/etc/ceph -v /ceph/osd_sdb/var/lib/ceph:/var/lib/ceph -v /dev:/dev --entrypoint ceph-volume docker.io/ceph/daemon:latest-nautilus lvm prepare --bluestore --dmcrypt --data /dev/sdb +(docker exec ceph_mon ceph config generate-minimal-conf) > /ceph/osd_sdb/etc/ceph/ceph.conf +docker run --rm --net=ceph --hostname $(hostname) --privileged -v /ceph/osd_sdb/etc/ceph:/etc/ceph -v /ceph/osd_sdb/var/lib/ceph:/var/lib/ceph -v /dev:/dev --entrypoint ceph-volume docker.io/ceph/daemon:latest-nautilus lvm prepare --bluestore --dmcrypt --data /dev/sdb +rm /ceph/osd_sdb/var/lib/ceph/bootstrap-osd/ceph.keyring mkdir -p /ceph/osd_sdc/etc/ceph/ /ceph/osd_sdc/var/lib/ceph/bootstrap-osd /ceph/osd_sdc/var/lib/ceph/osd (docker exec ceph_mon ceph auth get client.bootstrap-osd) > /ceph/osd_sdc/var/lib/ceph/bootstrap-osd/ceph.keyring -cp -a /ceph/mon/etc/ceph/ceph.conf /ceph/osd_sdc/etc/ceph/ -docker run --rm --net=host --privileged -v /ceph/osd_sdc/etc/ceph:/etc/ceph -v /ceph/osd_sdc/var/lib/ceph:/var/lib/ceph -v /dev:/dev --entrypoint ceph-volume docker.io/ceph/daemon:latest-nautilus lvm prepare --bluestore --dmcrypt --data /dev/sdc +(docker exec ceph_mon ceph config generate-minimal-conf) > /ceph/osd_sdc/etc/ceph/ceph.conf +docker run --rm --net=ceph --hostname $(hostname) --privileged -v /ceph/osd_sdc/etc/ceph:/etc/ceph -v /ceph/osd_sdc/var/lib/ceph:/var/lib/ceph -v /dev:/dev --entrypoint ceph-volume docker.io/ceph/daemon:latest-nautilus lvm prepare --bluestore --dmcrypt --data /dev/sdc +rm /ceph/osd_sdc/var/lib/ceph/bootstrap-osd/ceph.keyring -docker run -d --rm --net=host --privileged -v /ceph/osd04/etc/ceph:/etc/ceph -v /ceph/osd04/var/lib/ceph:/var/lib/ceph -v /dev:/dev -e OSD_ID=4 --name osd04 docker.io/ceph/daemon:latest-nautilus osd_ceph_volume_activate -docker run -d --rm --net=host --privileged -v /ceph/osd05/etc/ceph:/etc/ceph -v /ceph/osd05/var/lib/ceph:/var/lib/ceph -v /dev:/dev -e OSD_ID=5 --name osd05 docker.io/ceph/daemon:latest-nautilus osd_ceph_volume_activate +docker run -d --rm --net=ceph --hostname $(hostname) --privileged -v /ceph/osd04/etc/ceph:/etc/ceph -v /ceph/osd04/var/lib/ceph:/var/lib/ceph -v /dev:/dev -e OSD_ID=4 --name ceph_osd04 docker.io/ceph/daemon:latest-nautilus osd_ceph_volume_activate +docker run -d --rm --net=ceph --hostname $(hostname) --privileged -v /ceph/osd05/etc/ceph:/etc/ceph -v /ceph/osd05/var/lib/ceph:/var/lib/ceph -v /dev:/dev -e OSD_ID=5 --name ceph_osd05 docker.io/ceph/daemon:latest-nautilus osd_ceph_volume_activate #mds mkdir -p /ceph/mds/etc/ceph/ /ceph/mds/var/lib/ceph/bootstrap-mds -(docker exec ceph_mon ceph auth get client.bootstrap-mds) > /ceph/mds/var/lib/ceph/bootstrap-mds/ceph.keyring -cp -a /ceph/mon/etc/ceph/ceph.conf /ceph/mon/etc/ceph/ceph.client.admin.keyring /ceph/mds/etc/ceph/ -docker run -d --rm --net=host -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds +(docker exec ceph_mon ceph config generate-minimal-conf) > /ceph/mds/etc/ceph/ceph.conf +cp -a /ceph/mon/etc/ceph/ceph.client.admin.keyring /ceph/mds/etc/ceph/ +docker run --rm --net=ceph --hostname $(hostname) -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds +rm /ceph/mds/etc/ceph/ceph.client.admin.keyring +docker run -d --rm --net=ceph --hostname $(hostname) -v /ceph/mds/etc/ceph:/etc/ceph -v /ceph/mds/var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 --name ceph_mds docker.io/ceph/daemon:latest-nautilus mds #status