From 20b0b23fa29f550738dc0522e8d2bd638f5a94cd Mon Sep 17 00:00:00 2001 From: Denis Pynkin Date: Thu, 25 Aug 2016 14:30:39 +0300 Subject: [PATCH] regular.mk, lxc, lxd: updated regular-server-lxd Use lxd-bridge for networking. --- conf.d/regular.mk | 4 ++-- features.in/lxc/config.mk | 1 + features.in/lxc/stage2/image-scripts.d/30-lxd | 13 +++---------- pkg.in/lists/lxd | 3 +++ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 580c9c82..23a2a409 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -291,13 +291,13 @@ distro/regular-server-samba4: distro/.regular-server-managed @$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind) distro/regular-server-lxd: distro/.regular-bare \ - +efi +power \ + use/isohybrid +power \ use/live/base use/live/rw use/live/repo/online use/live/textinstall \ use/lxc/lxd use/tty/S0 \ use/init/systemd/multiuser @$(call set,KFLAVOURS,un-def) @$(call add,DEFAULT_SERVICES_ENABLE,sshd) - @$(call add,DEFAULT_SERVICES_ENABLE,lxd lxc-net lxcfs cgmanager) + @$(call add,DEFAULT_SERVICES_ENABLE,lxd-startup lxd-bridge lxcfs cgmanager) @$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0) @$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth) diff --git a/features.in/lxc/config.mk b/features.in/lxc/config.mk index 5923bd6c..d108f959 100644 --- a/features.in/lxc/config.mk +++ b/features.in/lxc/config.mk @@ -7,5 +7,6 @@ use/lxc/lxd: use/lxc @$(call add,GROUPS,netadmin lxd) @$(call add,LIVE_LISTS,lxd) @$(call add,LIVE_LISTS,openssh) + @$(call add,LIVE_PACKAGES,su) @$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,udev-rule-generator-net) diff --git a/features.in/lxc/stage2/image-scripts.d/30-lxd b/features.in/lxc/stage2/image-scripts.d/30-lxd index 740f9e1a..7044a57b 100755 --- a/features.in/lxc/stage2/image-scripts.d/30-lxd +++ b/features.in/lxc/stage2/image-scripts.d/30-lxd @@ -6,24 +6,17 @@ echo LXD configuration usermod -v 1000000-1065535 -w 1000000-1065535 root # Configuration of LXD -# By defult bridge provided by lxc-net service is used -# but here we are ready to start own bridge -cat </etc/sysconfig/lxd -# FORCE_IMAGE_SYNC=true - -# lxdbr0 defaults to only setting up the standard IPv6 link-local network -# to enable routable IPv4 and/or IPv6, please edit /etc/sysconfig/lxd - +cat </etc/sysconfig/lxd-bridge # The values below are defaults USE_LXD_BRIDGE="true" LXD_BRIDGE="lxdbr0" LXD_CONFILE="/etc/lxd/dnsmasq.conf" -#LXD_DOMAIN="lxd" +LXD_DOMAIN="lxd" # IPv4 LXD_IPV4_ADDR="192.168.202.1" LXD_IPV4_NETMASK="255.255.255.0" -LXD_IPV4_NETWORK="192.168.202.0" +LXD_IPV4_NETWORK="192.168.202.0/24" LXD_IPV4_DHCP_RANGE="192.168.202.100,192.168.202.199" LXD_IPV4_DHCP_MAX="100" LXD_IPV4_NAT="true" diff --git a/pkg.in/lists/lxd b/pkg.in/lists/lxd index 0a5424df..f783708e 100644 --- a/pkg.in/lists/lxd +++ b/pkg.in/lists/lxd @@ -4,3 +4,6 @@ lxc cgmanager lxcfs lxd + +# For storage creation +python3