Cleanup and updates to physical podconfigs
Change-Id: Iefdb3e39d9aaa1343e40b0b9131d0f0c6b2cadd1
diff --git a/Makefile b/Makefile
index 81ab6cc..0834fb7 100644
--- a/Makefile
+++ b/Makefile
@@ -271,7 +271,7 @@
$(ANSIBLE_PB) $(PI)/deploy-onos-playbook.yml $(LOGCMD)
touch $@
-$(M)/onos-debug: | $(M)/onboard-profile
+$(M)/onos-debug: | $(M)/onboard-profile $(M)/deploy-onos
$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) $(PI)/onos-debug-playbook.yml" $(LOGCMD)
touch $@
diff --git a/docker_images.yml b/docker_images.yml
index ba36fbe..51693d6 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# docker_images.yml
# master list of docker images used by imagebuilder.py
diff --git a/podconfig/rcord-physical-example.yml b/podconfig/physical-example.yml
similarity index 89%
rename from podconfig/rcord-physical-example.yml
rename to podconfig/physical-example.yml
index 2a63216..2ff1283 100644
--- a/podconfig/rcord-physical-example.yml
+++ b/podconfig/physical-example.yml
@@ -13,11 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# rcord-physical-example Pod Config
-# Example configuration for a physical R-CORD pod
+# physical-example Pod Config
+# Example configuration for a physical CORD pod
+# The name of the scenario to use, found in the scenarios directory
+# `cord` is the standard CORD POD with XOS, ONOS, MaaS and OpenStack
cord_scenario: cord
-cord_profile: rcord
+
+# The name of the profile to use, found in the
+# platform-install/profile_manifests directory
+# Example values: `rcord`, `ecord`, `mcord`, `opencloud`
+cord_profile: <must_be_set>
# Bring up the corddev VM. This is the `build` node as specified in ansible
# inventory below.
@@ -107,6 +113,10 @@
# - 'interface_config'
# Inventory for ansible, used to generate inventory.ini
+#
+# A physical podconfig must contain this, and will minimally set the head node
+# address in the `head` section..
+#
# There must be config, build, head, and compute sections
inventory_groups:
diff --git a/podconfig/rcord-mock.yml b/podconfig/rcord-mock.yml
index 1ece4c5..f1b38e6 100644
--- a/podconfig/rcord-mock.yml
+++ b/podconfig/rcord-mock.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
-# mock-rcord Pod Config
+# rcord-mock Pod Config
# Creates a single-node mock R-CORD pod
cord_scenario: mock
diff --git a/podconfig/rcord-single.yml b/podconfig/rcord-single.yml
index 9c4298a..7efb1da 100644
--- a/podconfig/rcord-single.yml
+++ b/podconfig/rcord-single.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# rcord-single Pod Config
# Creates a single-node mock R-CORD pod w/synchronizers
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index b8305aa..e32e93a 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# cord Scenario
# for both Physical (using a corddev VM) and Virtual (using multiple VMs)
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 906b56e..a2f1258 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
-# single head-node scenario
+# single node scenario (head-node only)
# Brings up a VM with synchronizers, for more complicated testing without OpenStack
# create a cord_profile dir next to the cord checkout