Skip to content

Commit

Permalink
Rename forceneutronsles12 to want_neutronsles12.
Browse files Browse the repository at this point in the history
  • Loading branch information
aplanas committed Mar 5, 2015
1 parent f9aff32 commit bef2f6e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/qa_crowbarsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@ function custom_configuration()
fi

# assign neutron-l3 role to one of SLE12 nodes
if [ -n "$want_sles12" ] && [ -z "$hacloud"] && [ -n "$forceneutronsles12" ] && iscloudver 5plus ; then
if [ -n "$want_sles12" ] && [ -z "$hacloud"] && [ -n "$want_neutronsles12" ] && iscloudver 5plus ; then
# 2015-03-03 off-by-default because Failed to validate proposal: Role neutron-l3 can't be used for suse 12.0, windows /.*/ platform(s).
local sle12node=$(knife search node "target_platform:suse-12.0" -a name | grep ^name: | cut -d : -f 2 | tail -n 1 | sed 's/\s//g')
proposal_set_value neutron default "['deployment']['neutron']['elements']['neutron-l3']" "['$sle12node']"
Expand Down

0 comments on commit bef2f6e

Please sign in to comment.