Merge branch 'master' into expand-cluster-with-detected-peers

Tendrl · Feb 26, 2018 · d61cf62 · d61cf62
2 parents 7c5a07e + 8660bbf
commit d61cf62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,4 +32,3 @@ env:
  - TOXENV=pep8
  - TOXENV=check_commit_msg
  - TOXENV=py27-cover-master
- - TOXENV=docs
diff --git a/tendrl/commons/objects/cluster_node_context/__init__.py b/tendrl/commons/objects/cluster_node_context/__init__.py
@@ -8,7 +8,7 @@ class ClusterNodeContext(objects.BaseObject):
  def __init__(self, node_id=None, fqdn=None, updated_at=None,
  tags=None, status=None, sync_status=None,
  last_sync=None, first_sync_done=None,
- *args, **kwargs):
+ is_managed=None, *args, **kwargs):
  super(ClusterNodeContext, self).__init__(*args, **kwargs)
  _node_context = NS.node_context.load()
  self.node_id = node_id or _node_context.node_id
@@ -19,6 +19,7 @@ def __init__(self, node_id=None, fqdn=None, updated_at=None,
  self.sync_status = sync_status or _node_context.sync_status
  self.last_sync = last_sync or _node_context.last_sync
  self.first_sync_done = first_sync_done
+ self.is_managed = is_managed
  self.value = 'clusters/{0}/nodes/{1}/NodeContext'
 
  def render(self):