allow unspecified config variables in pillars (closes #5341013)
authorAdrien Di Mascio <Adrien.DiMascio@logilab.fr>
Thu, 07 May 2015 17:59:17 +0200
changeset 19 5583ce316f3f
parent 18 91b14c60db11
child 20 e1732ce091ca
allow unspecified config variables in pillars (closes #5341013)
_modules/cubicweb.py
cubicweb/instances.sls
--- a/_modules/cubicweb.py	Fri Apr 17 13:55:36 2015 +0200
+++ b/_modules/cubicweb.py	Thu May 07 17:59:17 2015 +0200
@@ -170,6 +170,8 @@
     params = []
     admin = {}
     for key, value in kwargs.items():
+        if value is None:
+            continue
         if key.startswith('__'):
             continue
         elif key.startswith('admin/'):
--- a/cubicweb/instances.sls	Fri Apr 17 13:55:36 2015 +0200
+++ b/cubicweb/instances.sls	Thu May 07 17:59:17 2015 +0200
@@ -28,8 +28,8 @@
     - admin/login: {{config.cwapp.adminuser}}
     - admin/password: {{config.cwapp.adminpass}}
     - cubes: {{config.cwapp.cubes.keys()}}
-    - db-host: {{config.database.host}}
-    - db-port: {{config.database.port}}
+    - db-host: {{config.database.get('host')}}
+    - db-port: {{config.database.get('port')}}
     - db-name: {{config.database.name}}
     - db-user: {{config.database.user}}
     - db-password: {{config.database.password}}