Merge pull request #23 from threefoldtech/development-v3-runmodes

config: add run modes as config dictionnary

bootstrap.py

@@ -23,13 +23,6 @@
 app = Flask(__name__, static_url_path='/static')
 app.url_map.strict_slashes = False
 
-runmodes = {
-    "prod": "production (v3)",
-    "test": "testing (v3)",
-    "dev": "development (v3)",
-    "qa": "qa-network (v3)",
-}
-
 #
 # Database
 #
@@ -67,7 +60,7 @@ def ipxe_script(release, farmer, extra="", source=None):
 
     kernel = os.path.join(config['kernel-path'], source)
 
-    if release not in runmodes.keys():
+    if release not in config['runmodes'].keys():
         abort(401)
 
     if not os.path.exists(kernel):
@@ -86,7 +79,7 @@ def ipxe_script(release, farmer, extra="", source=None):
 
 
     settings = {
-        "release": runmodes[release],
+        "release": config['runmodes'][release],
         "farmerid": farmer,
         "parameters": extra,
         "kernel": kernel_secure,
@@ -102,7 +95,7 @@ def ipxe_quick_script(release, farmer, extra=""):
     source = 'zero-os-development-zos-v2-generic.efi'
     kernel = os.path.join(config['kernel-path'], source)
 
-    if release not in runmodes.keys():
+    if release not in config['runmodes'].keys():
         abort(401)
 
     if not os.path.exists(kernel):
@@ -118,7 +111,7 @@ def ipxe_quick_script(release, farmer, extra=""):
         cmdline += " " + extra
 
     settings = {
-        "release": runmodes[release],
+        "release": config['runmodes'][release],
         "parameters": extra,
         "kernel": kernel,
         "cmdline": cmdline,

config.py.sample

@@ -24,4 +24,13 @@ config = {
 
     # sqlite3 database used for provisioning
     'bootstrap-db': 'db/bootstrap.sqlite3',
+
+    # allowed run-modes and their pretty name
+    'runmodes': {
+        "prod": "production (v3)",
+        "test": "testing (v3)",
+        "dev": "development (v3)",
+        "qa": "qa-network (v3)",
+    },
+
 }