From 289626250837490a160e1535a0a13985a6a2ce87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 4 Jul 2019 09:56:11 +0200
Subject: [PATCH] Moved Dell open manage setup

---
 14.Dell/1.Dell_openmanage/0_setup.sh          | 28 +++++++++++++++++
 .../4.Dell_openmanage/0_setup.sh              | 31 -------------------
 launcher.sh                                   |  1 -
 3 files changed, 28 insertions(+), 32 deletions(-)
 create mode 100755 14.Dell/1.Dell_openmanage/0_setup.sh
 delete mode 100755 3.New_server_deployment/4.Dell_openmanage/0_setup.sh

diff --git a/14.Dell/1.Dell_openmanage/0_setup.sh b/14.Dell/1.Dell_openmanage/0_setup.sh
new file mode 100755
index 00000000..aae8ebd3
--- /dev/null
+++ b/14.Dell/1.Dell_openmanage/0_setup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+source ../../global-conf.sh
+
+# DELL server - install dell openmanage
+# http://linux.dell.com/repo/community/openmanage/
+if ( ! dpkg -l | grep dmidecode ); then
+	apt-get install -y dmidecode
+fi
+
+if ( dmidecode | grep Dell ); then
+	if ( grep -qa container=lxc /proc/1/environ ); then
+		echo "The system is running in a LXC container, no Dell package will be installed."
+		exit 0
+	fi
+
+	echo 'deb http://linux.dell.com/repo/community/openmanage/930/bionic bionic main' > /etc/apt/sources.list.d/linux.dell.com.sources.list
+	gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F
+	gpg -a --export 1285491434D8786F | sudo apt-key add -
+
+	apt-get update
+	apt-get install -y srvadmin-all
+
+	# dsm_om_connsvc is the service to start a web interface on https://<ip_address>:1311/
+	# by default, the interface is only available to the root user
+	# sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
+	systemctl enable dsm_om_connsvc
+	systemctl start dsm_om_connsvc
+fi
diff --git a/3.New_server_deployment/4.Dell_openmanage/0_setup.sh b/3.New_server_deployment/4.Dell_openmanage/0_setup.sh
deleted file mode 100755
index 9eb47c7e..00000000
--- a/3.New_server_deployment/4.Dell_openmanage/0_setup.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-source /root/envsetup/global-conf.sh
-
-echo "Dell Open Manage setup is disabled."
-exit 0
-
-# DELL server - install dell openmanage
-if ( ! dpkg -l | grep dmidecode ); then
-	apt-get install -y dmidecode
-fi
-
-if ( dmidecode | grep Dell ); then
-	if ( grep -qa container=lxc /proc/1/environ ); then
-		echo "The system is running in a LXC container, no Dell package will be installed."
-		exit 0
-	fi
-
-	echo 'deb http://linux.dell.com/repo/community/ubuntu xenial openmanage' > /etc/apt/sources.list.d/linux.dell.com.sources.list
-	gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F
-	gpg -a --export 1285491434D8786F | sudo apt-key add - 
-
-	apt-get update
-	apt-get install -y srvadmin-all
-
-	update-rc.d dsm_om_connsvc defaults
-	echo "@reboot root /usr/sbin/service dsm_om_connsvc start" > /etc/cron.d/dell_openmanage
-
-	sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
-
-	service dsm_om_connsvc start
-fi
diff --git a/launcher.sh b/launcher.sh
index 800fe3c9..c91ec9ff 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -28,7 +28,6 @@ init() {
 	python3 -u /root/envsetup/envsetup.py 31
 	python3 -u /root/envsetup/envsetup.py 32
 	python3 -u /root/envsetup/envsetup.py 33
-	python3 -u /root/envsetup/envsetup.py 34
 
 	python3 -u /root/envsetup/envsetup.py 11
 	python3 -u /root/envsetup/envsetup.py 12
-- 
GitLab