From: Bin Hu <bh526r@att.com>
Date: Fri, 29 Jul 2016 00:13:55 +0000 (-0700)
Subject: Update -s parameter for Fuel installer
X-Git-Tag: colorado.1.0~23
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3e6a970dc3cb70f69e813fb66e75c7c6509e0dc2;p=ipv6.git

Update -s parameter for Fuel installer

Change-Id: Ie687d2f9865a30567dd6b330f5ecdb6d68f6b85e
Signed-off-by: Bin Hu <bh526r@att.com>
---

diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/featureconfig.rst
index 4713b31..80d4844 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/featureconfig.rst
@@ -83,14 +83,16 @@ Install OPNFV and Preparation
     # HA deployment in OpenStack-only environment
     # Scenario Name: os-nosdn-nofeature-ha
     # Scenario Configuration File: ha_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s ha_heat_ceilometer_scenario -i <iso-uri>
+    -s os-nosdn-nofeature-ha -i <iso-uri>
 
     # Non-HA deployment in OpenStack-only environment
     # Scenario Name: os-nosdn-nofeature-noha
     # Scenario Configuration File: no-ha_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s no-ha_heat_ceilometer_scenario -i <iso-uri>
+    -s os-nosdn-nofeature-noha -i <iso-uri>
 
     # Note:
     #
@@ -470,14 +472,16 @@ of OPNFV Colorado Release:
     # HA deployment in OpenStack with Open Daylight L2-only environment
     # Scenario Name: os-odl_l2-nofeature-ha
     # Scenario Configuration File: ha_odl-l2_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s ha_odl-l2_heat_ceilometer_scenario -i <iso-uri>
+    -s os-odl_l2-nofeature-ha -i <iso-uri>
 
     # Non-HA deployment in OpenStack with Open Daylight L2-only environment
     # Scenario Name: os-odl_l2-nofeature-noha
     # Scenario Configuration File: no-ha_odl-l2_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s no-ha_odl-l2_heat_ceilometer_scenario -i <iso-uri>
+    -s os-odl_l2-nofeature-noha -i <iso-uri>
 
     # Note:
     #
diff --git a/docs/reldoc/index.rst b/docs/reldoc/index.rst
index 3c3874e..444a220 100644
--- a/docs/reldoc/index.rst
+++ b/docs/reldoc/index.rst
@@ -83,14 +83,16 @@ Install OPNFV and Preparation
     # HA deployment in OpenStack-only environment
     # Scenario Name: os-nosdn-nofeature-ha
     # Scenario Configuration File: ha_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s ha_heat_ceilometer_scenario -i <iso-uri>
+    -s os-nosdn-nofeature-ha -i <iso-uri>
 
     # Non-HA deployment in OpenStack-only environment
     # Scenario Name: os-nosdn-nofeature-noha
     # Scenario Configuration File: no-ha_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s no-ha_heat_ceilometer_scenario -i <iso-uri>
+    -s os-nosdn-nofeature-noha -i <iso-uri>
 
     # Note:
     #
@@ -470,14 +472,16 @@ of OPNFV Colorado Release:
     # HA deployment in OpenStack with Open Daylight L2-only environment
     # Scenario Name: os-odl_l2-nofeature-ha
     # Scenario Configuration File: ha_odl-l2_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s ha_odl-l2_heat_ceilometer_scenario -i <iso-uri>
+    -s os-odl_l2-nofeature-ha -i <iso-uri>
 
     # Non-HA deployment in OpenStack with Open Daylight L2-only environment
     # Scenario Name: os-odl_l2-nofeature-noha
     # Scenario Configuration File: no-ha_odl-l2_heat_ceilometer_scenario.yaml
+    # You can use either Scenario Name or Scenario Configuration File Name in "-s" parameter
     sudo ./deploy.sh -b <stack-config-uri> -l <lab-name> -p <pod-name> \
-    -s no-ha_odl-l2_heat_ceilometer_scenario -i <iso-uri>
+    -s os-odl_l2-nofeature-noha -i <iso-uri>
 
     # Note:
     #