knife-proxmox-ve 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bfa352b40db68621f19322cdb1dfc060c37ac3faafa423d37b76c9ccd7d544f
-  data.tar.gz: 1f819e5625acbb197012847d54d15e6bace8b71108d3ad867b9fbb2ee0b8944e
+  metadata.gz: bff2fdcc58a1aeadf186e297e838ddb91510536f7cf0169ccb25a3091c590931
+  data.tar.gz: 9cdc6b30bfe1a9d8da2feb3f8cf622973dbb0ab553c13c10a3a9729ea444a46a
 SHA512:
-  metadata.gz: e185dc631d2d81abdfa6a0e5e1a3772bc66b8db9096f1fc4a358aa910b52c549f8a3c3b1bde159509b7b7dcc8decbc1433fbc10e56731428b69ce764d1162ea1
-  data.tar.gz: 26bf397b78eb7e03f832e506ff34ca026e370c416fb5ec2f1a7c2e4428c915229f851a68e404cec34ceb801f1fd8ee9790bdaec0673480e15f53405d45661453
+  metadata.gz: 118d4dd196b869f226c11801b728b4d71661c9aa9756210b3857bf6f629c45515199a9b2e0b9b0f27b07bbf1cee995de81eaa1e1e8102a228d415eae7a94a460
+  data.tar.gz: b2b0d7b679086f772f7d844c22635c9a749110405362788ece0e7de99a23eec68a97c1e7e18ddfdad30500a5bfb606e8f8ed4b396a61faa9a32a0a1a4f2226ae

data/lib/chef/knife/helpers/proxmox_vm_provision.rb

@@ -13,9 +13,11 @@ class Chef
     # cloud-init auth and plants it on the guest, but never touches the bootstrap connection.
     # The bootstrap command layers that on by overriding #apply_provision_auth!.
     module ProxmoxVmProvision
-      # Proxmox bridge interface names: "vmbr" followed by digits (vmbr0, vmbr1, ...).
-      # IP/gateway validation is handled separately by IPAddr in #validate_ip!/#validate_gateway!.
-      VMBR_PATTERN = /\Avmbr\d+\z/
+      # A bridge is any Linux network interface: a classic bridge (vmbr0), an SDN VNet
+      # (arbitrary name, e.g. "mail"), an OVS bridge, a bond, etc. We only enforce what the
+      # kernel itself does on an interface name — 1..15 chars, no whitespace, no "/", and not
+      # "." or "..". IP/gateway validation is handled separately by IPAddr below.
+      BRIDGE_PATTERN = %r{\A(?!\.{1,2}\z)[^\s/]{1,15}\z}
 
       # A pasted PRIVATE key must never travel as an authorized public key.
       PRIVATE_KEY_MARKER = /-----BEGIN [A-Z ]*PRIVATE KEY-----/
@@ -73,8 +75,8 @@ class Chef
           # --- Networking -------------------------------------------------------
 
           option :bridge,
-            long:        "--bridge vmbrN",
-            description: "Network bridge for net0 (e.g. vmbr0)."
+            long:        "--bridge NAME",
+            description: "Network bridge for net0 (e.g. vmbr0 or an SDN VNet name)."
 
           option :vlan,
             long:        "--vlan TAG",
@@ -193,9 +195,10 @@ class Chef
       def validate_bridge!
         bridge = config[:bridge]
         return if bridge.nil?
-        return if VMBR_PATTERN.match?(bridge)
+        return if BRIDGE_PATTERN.match?(bridge)
 
-        ui.fatal!("--bridge #{bridge.inspect} is not a valid bridge name (expected vmbrN, e.g. vmbr0)")
+        ui.fatal!("--bridge #{bridge.inspect} is not a valid interface name " \
+                  "(1-15 chars, no whitespace or '/'; e.g. vmbr0 or an SDN VNet name)")
       end
 
       def validate_ip!

data/lib/knife-proxmox-ve/version.rb

@@ -2,6 +2,6 @@
 
 module Knife
   module Proxmox
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-proxmox-ve
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Wojcieszonek