Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index 9d038f6..f3d6a7e 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -65,6 +65,14 @@
sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/cord-vtn-vsg.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/cord-volt-devices.yaml
+clean-nodes:
+ rm -f nodes.yaml
+
+update-nodes: nodes.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
+
+new-nodes: clean-nodes update-nodes vtn
+
exampleservice:
sudo cp id_rsa key_import/exampleservice_rsa
sudo cp id_rsa.pub key_import/exampleservice_rsa.pub
diff --git a/xos/core/xoslib/dashboards/xosTenant.html b/xos/core/xoslib/dashboards/xosTenant.html
index b083bde..814f3de 100644
--- a/xos/core/xoslib/dashboards/xosTenant.html
+++ b/xos/core/xoslib/dashboards/xosTenant.html
@@ -4,7 +4,6 @@
<!-- inject:css -->
<link rel="stylesheet" href="/static/css/xosTenant.css">
<!-- endinject -->
-<<<<<<< HEAD
<div ng-app="xos.tenant" id="xosTenant" class="container-fluid">
@@ -15,4 +14,4 @@
<!-- endjs -->
<!-- inject:js -->
<script src="/static/js/xosTenant.js"></script>
-<!-- endinject -->
\ No newline at end of file
+<!-- endinject -->