From 6ef9d016f97ab35902cb14c7a852597458919fe0 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 29 Apr 2021 17:17:43 +0200 Subject: [PATCH] F #5332: Adjust inputs, show description (cherry picked from commit b03efb08ae2b2c205ee1d6acdb7e1581285f2451) --- .../onprem/provisions/onprem.d/inputs.yml | 11 +---------- src/oneprovision/lib/provision/provision_config.rb | 3 +++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/share/oneprovision/edge-clusters/onprem/provisions/onprem.d/inputs.yml b/share/oneprovision/edge-clusters/onprem/provisions/onprem.d/inputs.yml index 343382a21a..d0d2111bf5 100644 --- a/share/oneprovision/edge-clusters/onprem/provisions/onprem.d/inputs.yml +++ b/share/oneprovision/edge-clusters/onprem/provisions/onprem.d/inputs.yml @@ -28,15 +28,6 @@ inputs: - 'lxc' - 'firecracker' - - name: 'dns' - type: text - description: 'Comma separated list of DNS servers for public network' - default: '1.1.1.1' - - - name: 'public_network_bridge' - type: text - description: 'Name of the bridge to be created by OpenNebula for public networking.' - - name: 'first_public_ip' type: text description: 'First public IP for the public IPs address range.' @@ -54,4 +45,4 @@ inputs: type: text description: 'Physical device to be used for private networking.' -... \ No newline at end of file +... diff --git a/src/oneprovision/lib/provision/provision_config.rb b/src/oneprovision/lib/provision/provision_config.rb index d2c033c383..d68f39beb9 100644 --- a/src/oneprovision/lib/provision/provision_config.rb +++ b/src/oneprovision/lib/provision/provision_config.rb @@ -696,6 +696,9 @@ module OneProvision puts + desc = input['description'] + puts desc if desc && !desc.empty? + case input['type'] when 'text', 'text64' print "Text `#{input['name']}` (default=#{input['default']}): "