summaryrefslogtreecommitdiffstats
path: root/CentOS
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2017-03-07 17:03:38 +0530
committerGitHub <noreply@github.com>2017-03-07 17:03:38 +0530
commit39f737f351dfee39238ee72cf5d882544afc5820 (patch)
tree8f44c6334aac0c4afd08526d6ca3bdec1e47244e /CentOS
parent75873c99cbe113ef2120402d99650cb88d99f29c (diff)
parent249c7962e754bde02a4356b472e01eeff333f392 (diff)
downloadgluster-39f737f351dfee39238ee72cf5d882544afc5820.tar.gz
gluster-39f737f351dfee39238ee72cf5d882544afc5820.tar.bz2
gluster-39f737f351dfee39238ee72cf5d882544afc5820.tar.xz
gluster-39f737f351dfee39238ee72cf5d882544afc5820.zip
Merge pull request #34 from MohamedAshiqrh/fixrpc
RPCbind, Udev and getty fixes
Diffstat (limited to 'CentOS')
-rw-r--r--CentOS/Dockerfile11
-rw-r--r--CentOS/gluster-setup.service2
2 files changed, 11 insertions, 2 deletions
diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
index 48d4cbc..329ec74 100644
--- a/CentOS/Dockerfile
+++ b/CentOS/Dockerfile
@@ -24,6 +24,14 @@ RUN sed -i '/Defaults requiretty/c\#Defaults requiretty' /etc/sudoers
# Changing the port of sshd to avoid conflicting with host sshd
RUN sed -i '/Port 22/c\Port 2222' /etc/ssh/sshd_config
+# Fixing RPC port conflict issue
+RUN sed -i 's/Requires\=rpcbind\.service//g' /usr/lib/systemd/system/glusterd.service
+
+RUN sed -i 's/rpcbind\.service/gluster-setup\.service/g' /usr/lib/systemd/system/glusterd.service
+
+# Fix for the separate /var on host issue
+RUN sed -i 's/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="systemd_end"/g' /usr/lib/udev/rules.d/99-systemd.rules
+
# Backing up gluster config as it overlaps when bind mounting.
RUN mkdir -p /etc/glusterfs_bkp /var/lib/glusterd_bkp /var/log/glusterfs_bkp;\
cp -r /etc/glusterfs/* /etc/glusterfs_bkp;\
@@ -47,8 +55,9 @@ RUN chmod 500 /usr/sbin/gluster-setup.sh
VOLUME [ “/sys/fs/cgroup” ]
RUN systemctl disable nfs-server.service
+# stops getty from consuming all the memory
+RUN systemctl mask getty.target
RUN systemctl enable ntpd.service
-RUN systemctl enable rpcbind.service
RUN systemctl enable glusterd.service
RUN systemctl enable gluster-setup.service
diff --git a/CentOS/gluster-setup.service b/CentOS/gluster-setup.service
index 4cccd57..4bb8b68 100644
--- a/CentOS/gluster-setup.service
+++ b/CentOS/gluster-setup.service
@@ -1,6 +1,6 @@
[Unit]
Description=Configuring GlusterFS in container
-Before=rpcbind.service
+Before=glusterd.service
[Service]
Type=oneshot