cloud-init-dev team mailing list archive

[Hongjiang Zhang <honzhan@xxxxxxxxxxxxx>]

Hongjiang Zhang has proposed merging ~redriver/cloud-init:fail_to_install_on_frbsd into cloud-init:master.

Commit message:
tools/build-on-freebsd was blocked

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

LP: #1698077

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~redriver/cloud-init/+git/cloud-init/+merge/325718

tools/build-on-freebsd was blocked

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

LP: #1698077
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~redriver/cloud-init:fail_to_install_on_frbsd into cloud-init:master.

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