commit 64bbec9bcb6705e6535fb6b7414b8eda91519d19
author Marek Celoud <mceloud@mirantis.com> Thu Aug 24 16:05:44 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Thu Aug 24 16:05:46 2017 +0000
tree aadd01f9d370b69b1bc6ca790321a6b029fbaa98
parent 43cb1cc41341380270c134edc56baf08884c29cc
parent 5271d733bebce57bf209c09100d6be8a8b5d8a0a

Merge "Fix formula for newer contrail with systemd"

opencontrail/files/3.0/config.global.js

diff --git a/opencontrail/files/3.0/config.global.js b/opencontrail/files/3.0/config.global.js
index 402cc35..e4397c3 100644
--- a/opencontrail/files/3.0/config.global.js
+++ b/opencontrail/files/3.0/config.global.js
@@ -276,7 +276,7 @@
  * Default: false
  *
 ******************************************************************************/
-config.getDomainProjectsFromApiServer = false;
+config.getDomainProjectsFromApiServer = {{ web.get('projects_from_api', 'false')|lower }};
 /*****************************************************************************
 * Boolean flag L2_enable indicates the default forwarding-mode of a network.
 * Allowed values : true / false

opencontrail/files/4.0/config.global.js

diff --git a/opencontrail/files/4.0/config.global.js b/opencontrail/files/4.0/config.global.js
index 8e80e58..dcbd92f 100644
--- a/opencontrail/files/4.0/config.global.js
+++ b/opencontrail/files/4.0/config.global.js
@@ -344,7 +344,7 @@
  * Default: false
  *
 ******************************************************************************/
-config.getDomainProjectsFromApiServer = false;
+config.getDomainProjectsFromApiServer =  {{ web.get('projects_from_api', 'false')|lower }};
 /*****************************************************************************
 * Boolean flag L2_enable indicates the default forwarding-mode of a network.
 * Allowed values : true / false