Merge branch 'master' into mandatorysecretkey

Mirantis · Jan 11, 2018 · 435d482 · 435d482
2 parents 0a5e72e + 4f23e2e
commit 435d482
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ jobs:
   - stage: test
     install:
     - pip install -e ".[test]"
+    - pip check
     script:
     - python3 -m flake8
   - stage: test

diff --git a/kqueen/conftest.py b/kqueen/conftest.py
@@ -14,7 +14,6 @@
 import uuid
 import yaml
 
-config_file = 'config/test.py'
 config = current_config()
 fake = Faker()
 
@@ -56,7 +55,7 @@ def cluster():
         'id': _uuid,
         'name': 'Name for cluster {}'.format(_uuid),
         'provisioner': prov,
-        'state': 'deployed',
+        'state': config.get('CLUSTER_UNKNOWN_STATE'),
         'kubeconfig': yaml.load(open('kubeconfig_localhost', 'r').read()),
         'created_at': datetime.datetime(2017, 11, 15, 13, 36, 24),
         'owner': _user

diff --git a/kqueen/models.py b/kqueen/models.py
@@ -47,6 +47,9 @@ def get_state(self):
                 return self.state
             self.state = cluster['state']
             self.save()
+        else:
+            self.state = config.get('CLUSTER_UNKNOWN_STATE')
+            self.save()
 
         return self.state