Merge pull request #2 from crowbar/release/pebbles/master

Release/pebbles/master
Sort keys when creating /root/.ssh/authorized_keys

This will ensure that later chef-client runs won't update the file just
because the order became different.
Run crowbar_join.sh from local source in AutoYaST

It seems when the network is flaky autoyast tends to
download an empty file then instead. curl while the
network is still up works more reliable.
Merge pull request #140 from dirkmueller/release/pebbles/master

Run crowbar_join.sh from local source in AutoYaST
Merge pull request #142 from saschpe/release/pebbles/master

Explicitly set normal_attrs, fixes deprecation warning
Avoid duplicate test

No need for the if statement, since the test is already done with the
when statement.
Merge pull request #143 from vuntz/minor-cleanup

Avoid duplicate test
Merge pull request #139 from vuntz/sort-authorized_keys

Sort keys when creating /root/.ssh/authorized_keys
Avoid empty ssh keys in authorized_keys
Comment out set -x to turn off verbose logging during control.sh run
Merge pull request #147 from cdearborn/pull-req-release-pebbles-master-9eeea06f37f95273598d35cd142643a7ae0ac65a

https://github.com/crowbar/barclamp-provisioner/pull/147

Merged by devtool for VictorLowther
Replace github.com/dellcloudedge mentions with github.com/crowbar
Drop attribute 'root' from bc-template-provisioner.json

It was only used in recipes/update_nodes.rb whereas recipes/base.rb used
a node[:platform] check to set the correct tftpboot path. This would
all to drop a hack in SUSE packages.
Merge pull request #150 from saschpe/release/pebbles/master-drop-root-attr

Drop attribute 'root' from bc-template-provisioner.json
Merge pull request #149 from vuntz/replace-dellcloudedge

Replace github.com/dellcloudedge mentions with github.com/crowbar
Add back node["provisioner"]["root"], but not as configurable attribute

We just put it as an attribute with default value to make it easy to
change the value based on the distribution.
Merge pull request #151 from vuntz/tftproot-is-back

Add back node["provisioner"]["root"], but not as configurable attribute
Prefer /dev/disk/by-id/scsi-[A-Z] over /dev/disk/by-id/scsi-1*

The latter seems to be Type1 SCSI compatibility links, which
do not always exist on SLE11 SP3 due to udev bugs.
Merge pull request #154 from dirkmueller/release/pebbles/master

Prefer /dev/disk/by-id/scsi-[A-Z] over /dev/disk/by-id/scsi-1*
Explicitly set EDITOR=vi (unset on openSUSE / SLES)

Primarily this fixes annoying (log) messages from /usr/bin/quantum (due
to cliff/cmd2 usage):

which: no gedit in
(/sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games:/usr/lib/mit/bin:/usr/lib/mit/sbin)
which: no kate in
(/sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games:/usr/lib/mit/bin:/usr/lib/mit/sbin)

Furthermore, this simplifies introspection a bit since those commands
depend on $EDITOR:

    knife $THING edit $NAME
    crowbar $AREA proposal edit $PROPOSAL