[CORD-2495]
Make sure to get hostvars (setup) from compute node before generating
TOSCA templates

Change-Id: I32b7a3696da43bd9a5afc0be1c62acd0538d1115
diff --git a/compute-node-refresh-playbook.yml b/compute-node-refresh-playbook.yml
index 78ab31b..0e4bf65 100644
--- a/compute-node-refresh-playbook.yml
+++ b/compute-node-refresh-playbook.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,20 +14,23 @@
 # limitations under the License.
 
 
----
 # compute-node-refresh-playbook.yml
 # Re-adds compute nodes to a XOS after a teardown cycle
 # This analogous to the legacy `make vtn` command in service-profile
 # On physical/CiaB w/MaaS:
 #  ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml compute-node-refresh-playbook.yml
 
+- name: Get setup information from compute nodes
+  hosts: compute
+  tasks:
+    - name: run setup on compute nodes
+      setup:
+
 - name: Recreate compute node configuration
   hosts: head
   roles:
     - compute-node-config
 
-- include: add-onboard-containers-playbook.yml
-
 - name: Enable compute nodes in XOS
   hosts: head
   roles:
diff --git a/deploy-computenode-playbook.yml b/deploy-computenode-playbook.yml
index 217d7a0..157a19f 100644
--- a/deploy-computenode-playbook.yml
+++ b/deploy-computenode-playbook.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,11 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # deploy-computenode-playbook.yml
 # deploys compute nodes with Juju, creates config
 
+- name: Get setup information from compute nodes
+  hosts: compute
+  tasks:
+    - name: run setup on compute nodes
+      setup:
+
 - name: Deploy compute nodes, create configuration
   hosts: head
   roles: