Merge ~goneri/cloud-init:build-on-freebsd into cloud-init:master

[Gonéri Le Bouder]

freebsd: add chpasswd pkg in the image

cc_set_passwords.py depends on chpasswd binary.

[Dan Watkins (oddbloke)]

This looks like a reasonable set of changes to me; is there any good way for me to test it? (Perhaps in a container/public cloud?)

Also, do we need to open a bug for converting this script to Python 3 in preparation for dropping Python 2 support from cloud-init[0]?

[0] https://lists.launchpad.net/cloud-init/msg00170.html

[Gonéri Le Bouder (goneri)]

I use the following script to prepare my FreeBSD images, my freebsd branch comes with all the patches from my different branches:
https://github.com/virt-lightning/freebsd-cloud-images

Python3 is on my TODO list, with a lower priority. If you open a bug, you can affect it to me.

[do3meli (d-info-e)]

i wonder if tools/build-on-freebsd could not be dropped completely as there is an official freshport in the meanwhile: https://www.freshports.org/net/cloud-init/

the port is version 18.3 and includes just some FreeBSD specific patches out of which i know some are 100% obsolete in the meanwhile. see https://svnweb.freebsd.org/ports/head/net/cloud-init/files/

instead of having this script i would rather have a closer work together with the port maintainer to get these FreeBSD patches upstream if still needed.

or is there any good reason to still keep and maintain this build-on-freebsd script? if so i think we should make the script python2 and python3 compatible until we can drop python2 sometime in 2020.

just my 2 cents ;-)

[Gonéri Le Bouder (goneri)]

I use the script to quickly set-up my environment without depending on the port. I understand that the port is definitely a better solution most of the time, but it's also good to have a vanilla way to install the software.

[do3meli (d-info-e)]

sorry i somehow missed your answer. can not subscribe to this thread somehow. can you subscribe me as branch owner?

it is ok to have a vanilla way to install the software. it just needs to be maintained.

and independent of this: we should bring the freshport patches somehow upstream and update to a newer version there. maybe you have contact with the port maintainer already?

[Gonéri Le Bouder (goneri)]

I didn't know about the freshport patches until you mentioned that in your previous comment. I'm not that familiar with FreeBSD. Anyway, I haven't see any PR with these patches, but some of them are actually already covered by branches.

[Ryan Harper (raharper)]

Seems fine to me. I'm skipping CI since we don't exercise the build-on-freebsd tool.

review: Approve

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index d23fde2..dc3b974 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -9,6 +9,7 @@ fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
 depschecked=/tmp/c-i.dependencieschecked
 pkgs="
    bash
+   chpasswd
    dmidecode
    e2fsprogs
    py27-Jinja2
@@ -17,6 +18,7 @@ pkgs="
    py27-configobj
    py27-jsonpatch
    py27-jsonpointer
+   py27-jsonschema
    py27-oauthlib
    py27-requests
    py27-serial
@@ -28,12 +30,9 @@ pkgs="
 [ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
 touch $depschecked
 
-# Required but unavailable port/pkg: py27-jsonpatch py27-jsonpointer
-# Luckily, the install step will take care of this by installing it from pypi...
-
 # Build the code and install in /usr/local/:
-python setup.py build
-python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
+python2.7 setup.py build
+python2.7 setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
 
 # Enable cloud-init in /etc/rc.conf:
 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf