Merge ~redriver/cloud-init:fail_to_install_on_frbsd into cloud-init:master

[Hongjiang Zhang]

tools/build-on-freebsd was blocked

fail to run tools/build-on-freebsd on FreeBSD platform.

LP: #1698077

tools/build-on-freebsd was blocked

fail to run tools/build-on-freebsd on FreeBSD platform.

LP: #1698077

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

PASSED: Continuous integration, rev:3ac3e560626348e3efd88b30341e3e433b961a9e
https://jenkins.ubuntu.com/server/job/cloud-init-ci/535/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/535
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/535
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/535
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/535
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/535

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/535/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I'll look at this later, but i'm not sure we can just
- 'platform': platform.platform(),
+ 'platform': platform.uname()[0],

without breaking other things. I'll try this out today though and will find a freebsd to test on.

[Scott Moser (smoser)]

i've put up
 https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/325760

that covers most of these.

[Scott Moser (smoser)]

I'm marking this merged as the intent of it is merged.
the merge proposal above is in, and I think you should be good for building on freebsd now.

[Hongjiang Zhang (redriver)]

Yes. The build is successful on FreeBSD. Thanks

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 415ca37..2c8f04f 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -597,7 +597,7 @@ def get_cfg_option_int(yobj, key, default=0):
 
 def system_info():
     info = {
-        'platform': platform.platform(),
+        'platform': platform.uname()[0],
         'release': platform.release(),
         'python': platform.python_version(),
         'uname': platform.uname(),
diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index ccc10b4..f16d62e 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -17,6 +17,7 @@ pkgs="
    py27-jsonpatch
    py27-jsonpointer
    py27-oauth
+   py27-oauthlib
    py27-prettytable
    py27-requests
    py27-serial
@@ -35,9 +36,6 @@ touch $depschecked
 python setup.py build
 python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
 
-# Install the correct config file:
-cp config/cloud.cfg-freebsd /etc/cloud/cloud.cfg
-
 # Enable cloud-init in /etc/rc.conf:
 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
 echo 'cloudinit_enable="YES"' >> /etc/rc.conf