keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regular.mk, lxc, lxd: updated regular-server-lxd

Browse Source 
Use lxd-bridge for networking.
This commit is contained in:
Denis Pynkin 2016-08-25 14:30:39 +03:00 committed by Michael Shigorin
parent b2f8702774
commit 20b0b23fa2
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/regular.mk
View File

@ -291,13 +291,13 @@ distro/regular-server-samba4: distro/.regular-server-managed
@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind) @$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
distro/regular-server-lxd: distro/.regular-bare \ 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/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/lxc/lxd use/tty/S0 \ use/lxc/lxd use/tty/S0 \
use/init/systemd/multiuser use/init/systemd/multiuser
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd) @$(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,getty@tty1 getty@ttyS0)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth) @$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth)

1
features.in/lxc/config.mk
View File

@ -7,5 +7,6 @@ use/lxc/lxd: use/lxc
@$(call add,GROUPS,netadmin lxd) @$(call add,GROUPS,netadmin lxd)
@$(call add,LIVE_LISTS,lxd) @$(call add,LIVE_LISTS,lxd)
@$(call add,LIVE_LISTS,openssh) @$(call add,LIVE_LISTS,openssh)
@$(call add,LIVE_PACKAGES,su)
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
@$(call add,LIVE_PACKAGES,udev-rule-generator-net) @$(call add,LIVE_PACKAGES,udev-rule-generator-net)

13
features.in/lxc/stage2/image-scripts.d/30-lxd
View File

@ -6,24 +6,17 @@ echo LXD configuration
usermod -v 1000000-1065535 -w 1000000-1065535 root usermod -v 1000000-1065535 -w 1000000-1065535 root
# Configuration of LXD # Configuration of LXD
# By defult bridge provided by lxc-net service is used cat <<E_O_F >/etc/sysconfig/lxd-bridge
# but here we are ready to start own bridge
cat <<E_O_F >/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
# The values below are defaults # The values below are defaults
USE_LXD_BRIDGE="true" USE_LXD_BRIDGE="true"
LXD_BRIDGE="lxdbr0" LXD_BRIDGE="lxdbr0"
LXD_CONFILE="/etc/lxd/dnsmasq.conf" LXD_CONFILE="/etc/lxd/dnsmasq.conf"
#LXD_DOMAIN="lxd" LXD_DOMAIN="lxd"
# IPv4 # IPv4
LXD_IPV4_ADDR="192.168.202.1" LXD_IPV4_ADDR="192.168.202.1"
LXD_IPV4_NETMASK="255.255.255.0" 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_RANGE="192.168.202.100,192.168.202.199"
LXD_IPV4_DHCP_MAX="100" LXD_IPV4_DHCP_MAX="100"
LXD_IPV4_NAT="true" LXD_IPV4_NAT="true"

3
pkg.in/lists/lxd
View File

@ -4,3 +4,6 @@ lxc
cgmanager cgmanager
lxcfs lxcfs
lxd lxd
# For storage creation
python3