Merge pull request ManageIQ#74 from jaywcarman/powervs_cleanup

PowerVS cleanup
jaywcarman · Oct 7, 2020 · 0fe14dd · 0fe14dd
2 parents 217900c + 12efd0f
commit 0fe14dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 33 deletions.
diff --git a/...nageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/provision/state_machine.rb b/...nageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/provision/state_machine.rb
@@ -17,4 +17,4 @@ def prepare_volumes
 
     signal :prepare_provision
   end
-end
+end
diff --git a/app/models/manageiq/providers/ibm_cloud/power_virtual_servers/manager_mixin.rb b/app/models/manageiq/providers/ibm_cloud/power_virtual_servers/manager_mixin.rb
@@ -115,25 +115,5 @@ def raw_connect(api_key, pcloud_guid)
 
       {:token => token, :guid => pcloud_guid, :crn => power_iaas_service.crn, :region => power_iaas_service.region_id, :tenant => power_iaas_service.account_id}
     end
-
-    def raw_tenant_id(creds)
-      plst = get_pvstenantid(creds[:token])
-      plst[0][:tenant_id]
-    end
-
-    def api_rescue_block
-      _log.info("rescue")
-    end
-
-    def environment_for(region)
-      case region
-      when /germany/i
-        _log.info("germ")
-      when /usgov/i
-        _log.info("usa")
-      else
-        _log.info("else country")
-      end
-    end
   end
 end
diff --git a/...odels/manageiq/providers/ibm_cloud/power_virtual_servers/network_manager/cloud_network.rb b/...odels/manageiq/providers/ibm_cloud/power_virtual_servers/network_manager/cloud_network.rb
@@ -1,2 +1,2 @@
 class ManageIQ::Providers::IbmCloud::PowerVirtualServers::NetworkManager::CloudNetwork < ::CloudNetwork
-end
+end
diff --git a/config/settings.yml b/config/settings.yml
@@ -1,33 +1,27 @@
 :ems:
   :ems_ibm_cloud_power_virtual_servers:
-    :blacklisted_event_names: []
     :event_handling:
       :event_groups:
         :power:
           :critical:
           - IBM_CLOUD_POWER_VIRTUAL_SERVERS_instance_power_on
           - IBM_CLOUD_POWER_VIRTUAL_SERVERS_instance_power_off
+
 :ems_refresh:
   :ibm_cloud_power_virtual_servers:
     :storage_types:
-    - :description: Tier 1
+    - :description: Tier 1 (NVMe-based flash storage)
       :state: active
       :type: tier1
-    - :description: Tier 3
+    - :description: Tier 3 (SSD flash storage)
       :state: active
       :type: tier3
-    - :description: SSD
+    - :description: SSD (Legacy)
       :state: active
       :type: ssd-legacy
-    - :description: Standard
+    - :description: Standard (Legacy)
       :state: active
       :type: standard-legacy
-:http_proxy:
-  :ibm_cloud_power_virtual_servers:
-    :host:
-    :password:
-    :port:
-    :user:
 :log:
   :level_ibm_cloud: info
 :workers:
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ def prepare_volumes @@
         signal :prepare_provision
       end
-    end
+    end