Commit 9c07e81e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Each monitor should run instance of manager

parent dbc0a9e6
...@@ -55,6 +55,7 @@ all: ceph-config ...@@ -55,6 +55,7 @@ all: ceph-config
rm -rf /lib/ceph rm -rf /lib/ceph
install -v -Dm755 -d /etc/sysconfig install -v -Dm755 -d /etc/sysconfig
install -v -Dm755 -d /etc/systemd/system/ceph-mon.target.wants install -v -Dm755 -d /etc/systemd/system/ceph-mon.target.wants
install -v -Dm755 -d /etc/systemd/system/ceph-mgr.target.wants
install -v -Dm755 -o ceph -g ceph -d /etc/ceph install -v -Dm755 -o ceph -g ceph -d /etc/ceph
install -v -Dm755 -o ceph -g ceph -d /var/lib/ceph/bootstrap-osd install -v -Dm755 -o ceph -g ceph -d /var/lib/ceph/bootstrap-osd
install -v -Dm755 -o ceph -g ceph -d /var/lib/ceph/mds install -v -Dm755 -o ceph -g ceph -d /var/lib/ceph/mds
...@@ -69,6 +70,7 @@ all: ceph-config ...@@ -69,6 +70,7 @@ all: ceph-config
sed -e 's|^Environment=.*|ExecStartPre=/usr/sbin/ceph-mon-bootstrap|' -i /lib/systemd/system/ceph-mon@.service sed -e 's|^Environment=.*|ExecStartPre=/usr/sbin/ceph-mon-bootstrap|' -i /lib/systemd/system/ceph-mon@.service
systemctl enable ceph-mon.target systemctl enable ceph-mon.target
systemctl enable ceph-mgr.target
rm -rf ceph-14.2.2 rm -rf ceph-14.2.2
......
...@@ -68,9 +68,11 @@ ceph_set_mon_hostname() { ...@@ -68,9 +68,11 @@ ceph_set_mon_hostname() {
local hostname=`$UCI_GET ceph.mon.hostname` local hostname=`$UCI_GET ceph.mon.hostname`
if [ "$hostname" != "$1" ]; then if [ "$hostname" != "$1" ]; then
rm -f /etc/systemd/system/ceph-mon.target.wants/ceph-mon@$hostname.service rm -f /etc/systemd/system/ceph-mon.target.wants/ceph-mon@$hostname.service
rm -f /etc/systemd/system/ceph-mgr.target.wants/ceph-mgr@$hostname.service
$UCI_SET ceph.mon.hostname="$1" $UCI_SET ceph.mon.hostname="$1"
$UCI_COMMIT $UCI_COMMIT
systemctl enable ceph-mon@$1.service systemctl enable ceph-mon@$1.service
systemctl enable ceph-mgr@$1.service
fi fi
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment