generate config yaml file instead of long extra-vars parameter
fix var and typo
leave extraVars for maas use
Change-Id: Ia4d535a738c6ee1fab99c35879407785a0b08458
diff --git a/config/cord_in_a_box.yml b/config/cord_in_a_box.yml
index edc4bca..a2121ed 100644
--- a/config/cord_in_a_box.yml
+++ b/config/cord_in_a_box.yml
@@ -1,7 +1,7 @@
# Deployment configuration for VirtualBox based head node.
#
# This deployment configuration can be utilized with the head node created
-# via `vargrant up headnode` from the gerrit.opencord.org/maas repository.
+# via `vagrant up headnode` from the gerrit.opencord.org/maas repository.
---
debug: false
@@ -10,8 +10,8 @@
# User name and password used by Ansible to connect to the host for remote
# provisioning
- user: 'vagrant'
- password: 'vagrant'
+ ansible_user: 'vagrant'
+ ansible_ssh_pass: 'vagrant'
# Specifies tasks within the head node provisioning not to execute, including:
#
@@ -36,9 +36,10 @@
# virtualbox_support: 1
# power_helper_user: 'cord'
+ # on_cloudlab: True
+ cord_in_a_box: True
+
extraVars:
- #- 'on_cloudlab=True'
- - 'cord_in_a_box=True'
- 'fabric_include_names=eth2'
- 'fabric_include_module_types=omit'
- 'fabric_exclude_names=eth0,eth1'
diff --git a/genconfig/README.md b/genconfig/README.md
new file mode 100644
index 0000000..c2b726c
--- /dev/null
+++ b/genconfig/README.md
@@ -0,0 +1,3 @@
+# Generated config files
+
+These files are generated from other config, used by ansible
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index f34aaba..3d7e838 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -187,7 +187,7 @@
echo " $0 -c cleanup from previous test"
echo " $0 -d run diagnostic collector"
echo " $0 -h display this help message"
- echo " $0 -n number of compute nodes to setup. currently max 2 nodes can be supported"
+ echo " $0 -n # number of compute nodes to setup. Currently max 2 nodes can be supported"
echo " $0 -s run initial setup phase only (don't start building CORD)"
echo " $0 -t do install, bring up cord-pod configuration, run E2E test"
echo " $0 -v print CiaB version and exit"