Change var name: cord_provisioned -> on_maas
Change-Id: I046224d3e3297e551f596509367ac39a65fa7fb1
(cherry picked from commit fc43e8441f77ce9fbd5be13a7da7e98e529b9353)
diff --git a/vars/cord.yml b/vars/cord.yml
index 036b59d..65b7f4a 100644
--- a/vars/cord.yml
+++ b/vars/cord.yml
@@ -47,6 +47,3 @@
# turn this on, or override when running playbook with --extra-vars="on_cloudlab=True"
on_cloudlab: False
-
-# turn this off, or override when running playbook with --extra-vars="on_maas=False"
-on_maas: True
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 842e9c4..56a85e3 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -1,9 +1,8 @@
---
# vars/cord_defaults.yml
-# indicate that the nodes have been provisioned by CORD MaaS
-# Change or override for a multi-node install on CloudLab
-cord_provisioned: True
+# turn this off, or override when running playbook with --extra-vars="on_maas=False"
+on_maas: True
openstack_version: kilo
diff --git a/vars/cord_single_defaults.yml b/vars/cord_single_defaults.yml
index cb21344..e5890d4 100644
--- a/vars/cord_single_defaults.yml
+++ b/vars/cord_single_defaults.yml
@@ -3,7 +3,7 @@
# For a single-node case, we don't expect the node to already have been
# provisioned by CORD MaaS. It's just Ubuntu 14.04.
-cord_provisioned: False
+on_maas: False
openstack_version: kilo