Fix variable loading

projectcalico · Aug 4, 2016 · 70bc0c3 · 70bc0c3
1 parent ed9f217
commit 70bc0c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/calico.py b/calico.py
@@ -767,20 +767,24 @@ def main():
         _log.debug("Using %s=%s", ETCD_ENDPOINTS_ENV, etcd_endpoints)
 
     etcd_scheme = network_config.get(ETCD_SCHEME_KEY)
-    os.environ[ETCD_SCHEME_ENV] = etcd_scheme
-    _log.debug("Using %s=%s", ETCD_SCHEME_ENV, etcd_scheme)
+    if etcd_scheme:
+        os.environ[ETCD_SCHEME_ENV] = etcd_scheme
+        _log.debug("Using %s=%s", ETCD_SCHEME_ENV, etcd_scheme)
 
     etcd_key_file = network_config.get(ETCD_KEY_FILE_KEY)
-    os.environ[ETCD_KEY_FILE_ENV] = etcd_key_file
-    _log.debug("Using %s=%s", ETCD_KEY_FILE_ENV, etcd_key_file)
+    if etcd_key_file:
+        os.environ[ETCD_KEY_FILE_ENV] = etcd_key_file
+        _log.debug("Using %s=%s", ETCD_KEY_FILE_ENV, etcd_key_file)
 
     etcd_cert_file = network_config.get(ETCD_CERT_FILE_KEY)
-    os.environ[ETCD_CERT_FILE_ENV] = etcd_cert_file
-    _log.debug("Using %s=%s", ETCD_CERT_FILE_ENV, etcd_cert_file)
+    if etcd_cert_file:
+        os.environ[ETCD_CERT_FILE_ENV] = etcd_cert_file
+        _log.debug("Using %s=%s", ETCD_CERT_FILE_ENV, etcd_cert_file)
 
     etcd_ca_cert_file = network_config.get(ETCD_CA_CERT_FILE_KEY)
-    os.environ[ETCD_CA_CERT_FILE_ENV] = etcd_ca_cert_file
-    _log.debug("Using %s=%s", ETCD_CA_CERT_FILE_ENV, etcd_ca_cert_file)
+    if etcd_ca_cert_file:
+        os.environ[ETCD_CA_CERT_FILE_ENV] = etcd_ca_cert_file
+        _log.debug("Using %s=%s", ETCD_CA_CERT_FILE_ENV, etcd_ca_cert_file)
 
     # Get the CNI environment.
     env = os.environ.copy()

diff --git a/tests/unit/test_cni_plugin.py b/tests/unit/test_cni_plugin.py
@@ -732,6 +732,10 @@ def test_find_ipam_plugin(self, m_os):
     def test_main(self, m_conf_log, m_plugin, m_sys, m_os):
         # Mock
         m_os.environ = self.env
+        self.network_config["etcd_scheme"] = "https"
+        self.network_config["etcd_key_file"] = "etcdkeyfile"
+        self.network_config["etcd_cert_file"] = "certfile"
+        self.network_config["etcd_ca_cert_file"] = "cacertfile"
         m_sys.stdin.readlines.return_value = json.dumps(self.network_config)
         m_plugin(self.env, self.network_config).execute.return_value = 0
         m_plugin.reset_mock()