Make cgroups preexisting hard dependency

2018-09-14 10:41:00 +02:00 · 2018-09-14 10:41:00 +02:00 · b8bb87390f
commit b8bb87390f
parent ab82ed3fac
26 changed files with 22 additions and 55 deletions
--- a/activemq/setup/etc/init.d/activemq
+++ b/activemq/setup/etc/init.d/activemq
@ -2,10 +2,6 @@

 description="ActiveMQ container"

-depend() {
-	need cgroups
-}
-
 start() {
 	/usr/bin/lxc-start activemq
 }
--- a/basic/srv/vm/mgr/init.py
+++ b/basic/srv/vm/mgr/init.py
@ -189,11 +189,14 @@ class VMMgr:
        return deps

    def get_app_deps(self, app):
-        # Get "needs" line from init script and split it to list, skipping first two elements (docker, net)
+        # Get "needs" line from init script and split it to list
        try:
            with open(os.path.join('/etc/init.d', app), 'r') as f:
-                return [l.split()[2:] for l in f.readlines() if l.startswith('\tneed')][0]
+                for line in f.readlines():
+                    if line.strip().startswith('need'):
+                        return line.split()[1:]
        except:
+            pass
        return []

    def enable_autostart(self, app):
--- a/ckan-datapusher/setup/etc/init.d/ckan-datapusher
+++ b/ckan-datapusher/setup/etc/init.d/ckan-datapusher
@ -2,10 +2,6 @@

 description="CKAN DataPusher container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start ckan-datapusher
 }
--- a/ckan/setup/etc/init.d/ckan
+++ b/ckan/setup/etc/init.d/ckan
@ -3,7 +3,7 @@
 description="CKAN container"

 depend() {
-	need cgroups ckan-datapusher postgres redis solr
+	need ckan-datapusher postgres redis solr
 }

 start() {
--- a/crisiscleanup/setup/etc/init.d/crisiscleanup
+++ b/crisiscleanup/setup/etc/init.d/crisiscleanup
@ -3,7 +3,7 @@
 description="Crisis Cleanup container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/cts/setup/etc/init.d/cts
+++ b/cts/setup/etc/init.d/cts
@ -3,7 +3,7 @@
 description="CTS container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/frontlinesms/setup/etc/init.d/frontlinesms
+++ b/frontlinesms/setup/etc/init.d/frontlinesms
@ -2,10 +2,6 @@

 description="FrontlineSMS container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start frontlinesms
 }
--- a/gnuhealth/setup/etc/init.d/gnuhealth
+++ b/gnuhealth/setup/etc/init.d/gnuhealth
@ -3,7 +3,7 @@
 description="GNU Health container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/kanboard/setup/etc/init.d/kanboard
+++ b/kanboard/setup/etc/init.d/kanboard
@ -3,7 +3,7 @@
 description="KanBoard container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/mariadb/setup/etc/init.d/mariadb
+++ b/mariadb/setup/etc/init.d/mariadb
@ -2,10 +2,6 @@

 description="MariaDB container"

-depend() {
-	need cgroups
-}
-
 start() {
 	/usr/bin/lxc-start mariadb
 }
--- a/mifosx/setup/etc/init.d/mifosx
+++ b/mifosx/setup/etc/init.d/mifosx
@ -3,7 +3,7 @@
 description="Mifos X container"

 depend() {
-	need cgroups mariadb
+	need mariadb
 }

 start() {
--- a/motech/setup/etc/init.d/motech
+++ b/motech/setup/etc/init.d/motech
@ -3,7 +3,7 @@
 description="Motech container"

 depend() {
-	need cgroups activemq postgres
+	need activemq postgres
 }

 start() {
--- a/opendatakit-build/setup/etc/init.d/opendatakit-build
+++ b/opendatakit-build/setup/etc/init.d/opendatakit-build
@ -3,7 +3,7 @@
 description="OpenDataKit Build container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/opendatakit/setup/etc/init.d/opendatakit
+++ b/opendatakit/setup/etc/init.d/opendatakit
@ -3,7 +3,7 @@
 description="OpenDataKit Aggregate container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/openmapkit/setup/etc/init.d/openmapkit
+++ b/openmapkit/setup/etc/init.d/openmapkit
@ -2,10 +2,6 @@

 description="OpenMapKit container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start openmapkit
 }
--- a/pandora/setup/etc/init.d/pandora
+++ b/pandora/setup/etc/init.d/pandora
@ -3,7 +3,7 @@
 description="Pan.do/ra container"

 depend() {
-	need cgroups postgres rabbitmq
+	need postgres rabbitmq
 }

 start() {
--- a/postgres/setup/etc/init.d/postgres
+++ b/postgres/setup/etc/init.d/postgres
@ -2,10 +2,6 @@

 description="Postgres container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start postgres
 }
--- a/rabbitmq/setup/etc/init.d/rabbitmq
+++ b/rabbitmq/setup/etc/init.d/rabbitmq
@ -2,10 +2,6 @@

 description="RabbitMQ container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start rabbitmq
 }
--- a/redis/setup/etc/init.d/redis
+++ b/redis/setup/etc/init.d/redis
@ -2,10 +2,6 @@

 description="Redis container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start redis
 }
--- a/sahana-demo/setup/etc/init.d/sahana-demo
+++ b/sahana-demo/setup/etc/init.d/sahana-demo
@ -3,7 +3,7 @@
 description="Sahana Eden Demo container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/sahana/setup/etc/init.d/sahana
+++ b/sahana/setup/etc/init.d/sahana
@ -3,7 +3,7 @@
 description="Sahana Eden container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/sambro/setup/etc/init.d/sambro
+++ b/sambro/setup/etc/init.d/sambro
@ -3,7 +3,7 @@
 description="SAMBRO container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/seeddms/setup/etc/init.d/seeddms
+++ b/seeddms/setup/etc/init.d/seeddms
@ -3,7 +3,7 @@
 description="SeedDMS container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/sigmah/setup/etc/init.d/sigmah
+++ b/sigmah/setup/etc/init.d/sigmah
@ -3,7 +3,7 @@
 description="Sigmah container"

 depend() {
-	need cgroups postgres
+	need postgres
 }

 start() {
--- a/solr/setup/etc/init.d/solr
+++ b/solr/setup/etc/init.d/solr
@ -2,10 +2,6 @@

 description="Solr container"

-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start solr
 }
--- a/ushahidi/setup/etc/init.d/ushahidi
+++ b/ushahidi/setup/etc/init.d/ushahidi
@ -3,7 +3,7 @@
 description="Ushahidi container"

 depend() {
-	need cgroups mariadb
+	need mariadb
 }

 start() {