~redriver/cloud-init:frbsd-azure-branch

Branch merges

Propose for merging

Merged into cloud-init:master at revision 0a71d5a870b416f2c86c8bc196004bb3fc0768a0

Scott Moser: Approve on 2017-05-10

Server Team CI bot: Approve (continuous-integration) on 2017-05-08

Diff: 1374 lines (+782/-87)

22 files modified

cloudinit/config/cc_resizefs.py (+95/-0)
cloudinit/distros/__init__.py (+3/-0)
cloudinit/distros/freebsd.py (+261/-16)
cloudinit/settings.py (+1/-1)
cloudinit/sources/DataSourceAzure.py (+169/-11)
cloudinit/sources/helpers/azure.py (+10/-1)
cloudinit/stages.py (+1/-1)
cloudinit/util.py (+51/-1)
config/cloud.cfg-freebsd (+1/-1)
setup.py (+6/-4)
sysvinit/freebsd/cloudconfig (+0/-10)
sysvinit/freebsd/cloudfinal (+0/-10)
sysvinit/freebsd/cloudinit (+0/-10)
sysvinit/freebsd/cloudinitlocal (+1/-11)
tests/unittests/test_datasource/test_azure.py (+65/-0)
tests/unittests/test_datasource/test_azure_helper.py (+2/-2)
tests/unittests/test_datasource/test_cloudstack.py (+5/-0)
tests/unittests/test_distros/test_netconfig.py (+46/-1)
tests/unittests/test_handler/test_handler_resizefs.py (+59/-0)
tests/unittests/test_net.py (+3/-3)
tests/unittests/test_util.py (+2/-1)
tools/build-on-freebsd (+1/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

0ff61d4... by Hongjiang Zhang on 2017-05-08

remove Linux specific installation on FreeBSD

77669d5... by Hongjiang Zhang on 2017-05-04

modify according to Scott comments

1b1e0a8... by Hongjiang Zhang on 2017-04-27

fix the issue of 'ssh does not exist in /etc/rc.d'

c1cf3ad... by Hongjiang Zhang on 2017-04-25

Remove Azure specific check

Take the get_mount_info for Azure as a common case on FreeBSD.
This was only triggered if the device info '/dev/xxx' is illegal.

bba43d7... by Hongjiang Zhang on 2017-01-13

Fix the issues for FreeBSD running on Azure

and rebase with master.

41f93a6... by Jon Grimm on 2017-04-03

doc: Fix example for resolve.conf configuration.

Should be 'manage_resolv_conf' not 'manage-resolv-conf'.

LP: #1531582

291d297... by Jon Grimm on 2017-03-31

Fix examples that reference upstream chef repository.

Also add integration test. Note: this new test is not comprehensive; it
simply ensures that the example chef configuration does not blow up and
that chef seems to be installed after its completion.

This new test is disabled by default as it depends on a 3rd party
repository.

LP: #1678145

d690216... by David Tagatac on 2017-04-07

doc: correct grammar and improve clarity in merging documentation.

Move merging.rst into doc/rtd/topics with small fixes.

61d05d1... by Ryan Harper on 2017-03-28

doc: Add missing doc link to snap-config module.

a07f262... by Joshua Powers on 2017-03-24

snap: allows for creating cloud-init snap

Add a basic snapcraft.yaml file to allow the execution of cloud-init as
a snap. This will always pull down the latest source from master for
the snap. setup.py will now also set the default init system to be
systemd when no other is passed to it.