adding proxy settings

ManageIQ · Jul 18, 2017 · 3456a86 · 3456a86
1 parent 98c29af
commit 3456a86
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager.rb b/app/models/manageiq/providers/kubernetes/container_manager.rb
@@ -14,7 +14,7 @@ class ManageIQ::Providers::Kubernetes::ContainerManager < ManageIQ::Providers::C
   require_nested :Scanning
 
   include ManageIQ::Providers::Kubernetes::ContainerManagerMixin
-  include ManageIQ::Providers::Kubernetes::ContainerManager::Options
+  extend ManageIQ::Providers::Kubernetes::ContainerManager::Options
 
   # This is the API version that we use and support throughout the entire code
   # (parsers, events, etc.). It should be explicitly selected here and not

diff --git a/app/models/manageiq/providers/kubernetes/container_manager/options.rb b/app/models/manageiq/providers/kubernetes/container_manager/options.rb
@@ -1,7 +1,24 @@
 module ManageIQ::Providers::Kubernetes::ContainerManager::Options
   extend ActiveSupport::Concern
 
-  def settings_options
+  def proxy_settings
+    {
+      :http_proxy  => {
+        :label     => N_('HTTP Proxy'),
+        :help_text => N_('HTTP Proxy to connect image inspector pods to the internet'),
+      },
+      :https_proxy => {
+        :label     => N_('HTTPS Proxy'),
+        :help_text => N_('HTTPS Proxy to connect image inspector pods to the internet'),
+      },
+      :no_proxy    => {
+        :label     => N_('NO Proxy'),
+        :help_text => N_('NO Proxy lists urls that should\'nt be sent to any proxy'),
+      },
+    }
+  end
+
+  def advanced_settings
     {
       :image_inspector_options => {
         :http_proxy  => {