summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-07-27 12:41:01 -0700
committerGuo Ruijing <ruijing.guo@intel.com>2016-07-27 12:41:39 -0700
commit21a21c4d18b65b232799063d236ae2b09bb4007e (patch)
tree457a35db698a68f6ed7e23e91e03a200c4ef6ef1
parent6dc51a769dc837d2f4b6e013179c641d92be3e9d (diff)
Add experimental feature & remove hd boot
Change-Id: I7f08eb7ec46110f8e2f4726185d5a58fb52f5919 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 28 Jul 2016 02:46:29 +0000 Reviewed-on: https://review.openstack.org/348105 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rwxr-xr-xdemo/04_setup_fuel.sh6
-rw-r--r--demo/fuel-slave.xml1
2 files changed, 4 insertions, 3 deletions
diff --git a/demo/04_setup_fuel.sh b/demo/04_setup_fuel.sh
index 3e6cc50..463caec 100755
--- a/demo/04_setup_fuel.sh
+++ b/demo/04_setup_fuel.sh
@@ -61,8 +61,10 @@ do
61 sleep 20 61 sleep 20
62done 62done
63 63
64#cat astute.yaml | plink -ssh -pw r00tme root@10.20.0.2 "dd of=/etc/fuel/astute.yaml" 64plink -ssh -pw r00tme root@10.20.0.2 "cat /etc/fuel/astute.yaml" > astute.yaml
65#echo plink -ssh -pw r00tme root@10.20.0.2 "pkill fuelmenu" 65sed -i "/.*FEATURE_GROUPS.*/s/\[\]/\n \-\"Experimental\"/" astute.yaml
66cat astute.yaml | plink -ssh -pw r00tme root@10.20.0.2 "dd of=/etc/fuel/astute.yaml"
67plink -ssh -pw r00tme root@10.20.0.2 "pkill fuelmenu"
66 68
67inprog=1 69inprog=1
68while [ $inprog -ne 0 ] 70while [ $inprog -ne 0 ]
diff --git a/demo/fuel-slave.xml b/demo/fuel-slave.xml
index b45e475..34b9533 100644
--- a/demo/fuel-slave.xml
+++ b/demo/fuel-slave.xml
@@ -9,7 +9,6 @@
9 <os> 9 <os>
10 <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type> 10 <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type>
11 <boot dev='network'/> 11 <boot dev='network'/>
12 <boot dev='hd'/>
13 <bootmenu enable='no' /> 12 <bootmenu enable='no' />
14 </os> 13 </os>
15 <features> 14 <features>