cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/master to cc8bde2
Date Tue, 04 Feb 2014 20:53:41 GMT
Updated Branches:
  refs/heads/master 9b21da65d -> cc8bde242


Do not initialize contrail plugin component functionality like db sync, network offerring
creation when contrail is not installed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc8bde24
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc8bde24
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc8bde24

Branch: refs/heads/master
Commit: cc8bde242179dac5fe42cd3e10b69274b5719d6f
Parents: 9b21da6
Author: sbalineni <sbalineni@contrailsystems.com>
Authored: Mon Feb 3 22:46:38 2014 +0000
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Feb 4 12:35:29 2014 -0800

----------------------------------------------------------------------
 .../network/contrail/management/ContrailManagerImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc8bde24/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
index 616a8c5..b25de48 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
@@ -168,6 +168,9 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
 
     @Override
     public boolean start() {
+        if (_api == null) {
+            return true;
+        }
         /* Start background task */
         _dbSyncTimer = new Timer("DBSyncTimer");
         try {
@@ -301,8 +304,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
             String hostname = null;
             int port = 0;
             if (configFile == null) {
-                hostname = "localhost";
-                port = 8082;
+                return false;
             } else {
                 final Properties configProps = new Properties();
                 configProps.load(new FileInputStream(configFile));


Mime
View raw message