fix(openbsd): services & build tool

    * Added net/activator for `ifconfig` that is used with OpenBSD
    * Added sysvinit scripts for OpenBSD
    * Updated build-on-openbsd tool with additional dependencies and
      better logic
    * INFRA-900

cloudinit/net/activators.py

@@ -4,6 +4,7 @@
 from typing import Dict, Iterable, List, Optional, Type, Union
 
 from cloudinit import subp, util
+from cloudinit.net.ifconfig import available as ifconfig_available
 from cloudinit.net.eni import available as eni_available
 from cloudinit.net.netplan import available as netplan_available
 from cloudinit.net.network_manager import available as nm_available
@@ -101,6 +102,30 @@ def bring_down_interface(device_name: str) -> bool:
         cmd = ["ifdown", device_name]
         return _alter_interface(cmd, device_name)
 
+class IfConfigActivator(NetworkActivator):
+    @staticmethod
+    def available(target: Optional[str] = None) -> bool:
+        """Return true if ifconfig can be used on this system."""
+        return ifconfig_available(target=target)
+
+    @staticmethod
+    def bring_up_interface(device_name: str) -> bool:
+        """Bring up interface using ifconfig <dev> up.
+
+        Return True is successful, otherwise return False
+        """
+        cmd = ["ifconfig", device_name, "up"]
+        return _alter_interface(cmd, device_name)
+
+    @staticmethod
+    def bring_down_interface(device_name: str) -> bool:
+        """Bring up interface using ifconfig <dev> down.
+
+        Return True is successful, otherwise return False
+        """
+        cmd = ["ifconfig", device_name, "down"]
+        return _alter_interface(cmd, device_name)
+
 
 class NetworkManagerActivator(NetworkActivator):
     @staticmethod
@@ -216,13 +241,15 @@ def bring_down_interface(device_name: str) -> bool:
 # This section is mostly copied and pasted from renderers.py. An abstract
 # version to encompass both seems overkill at this point
 DEFAULT_PRIORITY = [
+    "ifconfig",
     "eni",
     "netplan",
     "network-manager",
     "networkd",
 ]
 
 NAME_TO_ACTIVATOR: Dict[str, Type[NetworkActivator]] = {
+    "ifconfig": IfConfigActivator,
     "eni": IfUpDownActivator,
     "netplan": NetplanActivator,
     "network-manager": NetworkManagerActivator,

cloudinit/net/ifconfig.py

@@ -0,0 +1,22 @@
+# This file is part of cloud-init. See LICENSE file for license information.
+
+import copy
+import glob
+import logging
+import os
+import re
+from typing import Optional
+
+from cloudinit import subp, util
+from cloudinit.net import ParserError, renderer, subnet_is_ipv6
+from cloudinit.net.network_state import NetworkState
+
+LOG = logging.getLogger(__name__)
+
+def available(target=None):
+    expected = ["ifconfig"]
+    search = ["/sbin"]
+    for p in expected:
+        if not subp.which(p, search=search, target=target):
+            return False
+    return True

setup.py

@@ -132,6 +132,11 @@ def render_tmpl(template, mode=None, is_yaml=False):
         for f in glob("sysvinit/netbsd/*")
         if is_f(f)
     ],
+    "sysvinit_openbsd": lambda: [
+        render_tmpl(f, mode=0o755)
+        for f in glob("sysvinit/openbsd/*")
+        if is_f(f)
+    ],
     "sysvinit_deb": lambda: [f for f in glob("sysvinit/debian/*") if is_f(f)],
     "sysvinit_openrc": lambda: [
         f for f in glob("sysvinit/gentoo/*") if is_f(f)
@@ -156,6 +161,7 @@ def render_tmpl(template, mode=None, is_yaml=False):
     "sysvinit": "etc/rc.d/init.d",
     "sysvinit_freebsd": "usr/local/etc/rc.d",
     "sysvinit_netbsd": "usr/local/etc/rc.d",
+    "sysvinit_openbsd": "etc/rc.d",
     "sysvinit_deb": "etc/init.d",
     "sysvinit_openrc": "etc/init.d",
     "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),

sysvinit/openbsd/cloudconfig.tmpl

@@ -0,0 +1,56 @@
+## template:jinja
+#!/bin/ksh
+
+# PROVIDE: cloudconfig
+# REQUIRE: cloudinit
+# BEFORE: sshd
+
+
+daemon="cloud-init"
+daemon_execdir="{{prefix}}/bin"
+daemon_flags="modules --mode config"
+#daemon_logger=
+daemon_rtable=0
+daemon_timeout=1
+daemon_user=root
+
+. /etc/rc.d/rc.subr
+
+#pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
+rc_bg="YES" # (undefined or "YES")
+#rc_reload= # (undefined or "NO")
+#rc_reload_signal=HUP
+#rc_stop_signal=TERM
+rc_usercheck="YES" # (undefined or "NO")
+
+#rc_configtest() {
+#}
+
+#rc_pre() {
+#}
+
+rc_start() {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
+    rc_exec "${daemon_execdir}/${daemon} ${daemon_flags}"
+}
+
+rc_check() {
+    #pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
+    pgrep -f "${daemon}" >/dev/null
+}
+
+#rc_reload() {
+#   pkill -${rc_reload_signal} -T "${daemon_rtable}" -xf "${pexp}"
+#}
+
+rc_stop() {
+    #pkill -${rc_stop_signal} -T "${daemon_rtable}" -xf "${pexp}"
+    pkill -f "${daemon}" >/dev/null
+}
+
+#rc_post() {
+#}
+
+rc_cmd "$1"

sysvinit/openbsd/cloudfinal.tmpl

@@ -0,0 +1,54 @@
+## template:jinja
+#!/bin/ksh
+
+# PROVIDE: cloudfinal
+# REQUIRE: LOGIN cloudconfig
+#
+daemon="cloud-init"
+daemon_execdir="{{prefix}}/bin"
+daemon_flags="modules --mode final"
+#daemon_logger=
+daemon_rtable=0
+daemon_timeout=1
+daemon_user=root
+
+. /etc/rc.d/rc.subr
+
+#pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
+rc_bg="YES" # (undefined or "YES")
+#rc_reload= # (undefined or "NO")
+#rc_reload_signal=HUP
+#rc_stop_signal=TERM
+rc_usercheck="YES" # (undefined or "NO")
+
+#rc_configtest() {
+#}
+
+#rc_pre() {
+#}
+
+rc_start() {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
+    rc_exec "${daemon_execdir}/${daemon} ${daemon_flags}"
+}
+
+rc_check() {
+    #pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
+    pgrep -f "${daemon}" >/dev/null
+}
+
+#rc_reload() {
+#   pkill -${rc_reload_signal} -T "${daemon_rtable}" -xf "${pexp}"
+#}
+
+rc_stop() {
+    #pkill -${rc_stop_signal} -T "${daemon_rtable}" -xf "${pexp}"
+    pkill -f "${daemon}" >/dev/null
+}
+
+#rc_post() {
+#}
+
+rc_cmd "$1"

sysvinit/openbsd/cloudinit.tmpl

@@ -0,0 +1,54 @@
+## template:jinja
+#!/bin/ksh
+
+# PROVIDE: cloudinit
+# REQUIRE: cloudinitlocal
+#
+daemon="cloud-init"
+daemon_execdir="{{prefix}}/bin"
+daemon_flags="init"
+#daemon_logger=
+daemon_rtable=0
+daemon_timeout=1
+daemon_user=root
+
+. /etc/rc.d/rc.subr
+
+#pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
+rc_bg="YES" # (undefined or "YES")
+#rc_reload= # (undefined or "NO")
+#rc_reload_signal=HUP
+#rc_stop_signal=TERM
+rc_usercheck="YES" # (undefined or "NO")
+
+#rc_configtest() {
+#}
+
+#rc_pre() {
+#}
+
+rc_start() {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
+    rc_exec "${daemon_execdir}/${daemon} ${daemon_flags}"
+}
+
+rc_check() {
+    #pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
+    pgrep -f "${daemon}" >/dev/null
+}
+
+#rc_reload() {
+#   pkill -${rc_reload_signal} -T "${daemon_rtable}" -xf "${pexp}"
+#}
+
+rc_stop() {
+    #pkill -${rc_stop_signal} -T "${daemon_rtable}" -xf "${pexp}"
+    pkill -f "${daemon}" >/dev/null
+}
+
+#rc_post() {
+#}
+
+rc_cmd "$1"

sysvinit/openbsd/cloudinitlocal.tmpl

@@ -0,0 +1,62 @@
+## template:jinja
+#!/bin/ksh
+
+# PROVIDE: cloudinitlocal
+{#
+``cloudinitlocal`` purposefully does not depend on ``dsidentify``.
+That makes it easy for image builders to create images without ``dsidentify``.
+#}
+# REQUIRE: NETWORKING
+
+# After NETWORKING because we don't want staticroute to wipe
+# the route set by the DHCP client toward the meta-data server.
+
+daemon="cloud-init"
+daemon_execdir="{{prefix}}/bin"
+daemon_flags="init -l"
+#daemon_logger=
+daemon_rtable=0
+daemon_timeout=1
+daemon_user=root
+
+. /etc/rc.d/rc.subr
+
+#pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
+rc_bg="YES" # (undefined or "YES")
+#rc_reload= # (undefined or "NO")
+#rc_reload_signal=HUP
+#rc_stop_signal=TERM
+#rc_usercheck= # (undefined or "NO")
+rc_usercheck="YES"
+
+#rc_configtest() {
+#}
+
+#rc_pre() {
+#}
+
+rc_start() {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
+    rc_exec "${daemon_execdir}/${daemon} ${daemon_flags}"
+}
+
+rc_check() {
+    #pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
+    pgrep -f "${daemon}" >/dev/null
+}
+
+#rc_reload() {
+#   pkill -${rc_reload_signal} -T "${daemon_rtable}" -xf "${pexp}"
+#}
+
+rc_stop() {
+    #pkill -${rc_stop_signal} -T "${daemon_rtable}" -xf "${pexp}"
+    pkill -f "${daemon}" >/dev/null
+}
+
+#rc_post() {
+#}
+
+rc_cmd "$1"

tools/build-on-openbsd

@@ -2,6 +2,12 @@
 
 fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
 
+PYTHON=${PYTHON:-python3}
+if [ ! $(which ${PYTHON}) ]; then
+    echo "Please install python first."
+    exit 1
+fi
+
 # Check dependencies:
 depschecked=/tmp/c-i.dependencieschecked
 pkgs="
@@ -16,12 +22,23 @@ pkgs="
    py3-setuptools
    py3-yaml
    sudo--
+   wget
 "
-[ -f "$depschecked" ] || pkg_add "${pkgs}" || fail "install packages"
 
-touch $depschecked
+[ -f $depschecked ] || echo "Installing the following packages: $pkgs"; output=$(pkg_add -zI $pkgs 2>&1)
+
+
+if  echo "$output" | grep -q -e "Can't find" -e "Ambiguous"; then
+    echo "Failed to find or install one or more packages"
+    echo "Failed Package(s):"
+    echo "$output"
+    exit 1
+else
+    echo Successfully installed packages
+    touch $depschecked
 
-python3 setup.py build
-python3 setup.py install -O1 --distro openbsd --skip-build
+    python3 setup.py build
+    python3 setup.py install -O1 --distro openbsd --skip-build --init-system sysvinit_openbsd
 
-echo "Installation completed."
+    echo "Installation completed."
+fi