diff --git a/hooks/create-lxc-config b/hooks/create-lxc-config index 5f3dd98..5160a98 100755 --- a/hooks/create-lxc-config +++ b/hooks/create-lxc-config @@ -23,10 +23,6 @@ def find_address(subnet, assigned_subsubnets) end end -CONFIG_PATH = Pathname.new("/etc/lxc/") -IPV4_SUBNET = NetAddr::CIDR.create("192.168.66.0/24") -IPV6_SUBNET = NetAddr::CIDR.create("2a01:4f8:210:31fd:1::/80") - options = OpenStruct.new options.container_name = try_env("LXC_NAME") options.container_config = try_env("LXC_CONFIG_FILE") @@ -57,6 +53,7 @@ OptionParser.new do |opts| end end end.parse! +CONFIG_PATH = Pathname.new("/etc/lxc/") container_data = CONFIG_PATH.join("container.json") data = if File.exists?(container_data) @@ -65,6 +62,10 @@ data = if File.exists?(container_data) {} end +zone = data["zone"] || {} +IPV4_SUBNET = NetAddr::CIDR.create(zone["v4_subnet"] || "192.168.10.0/24") +IPV6_SUBNET = NetAddr::CIDR.create(zone["v6_subnet"] || "fd7d:aed0:18aa::/48") + data["network"] ||= {} #if data["network"][options.container_name]