From 90d7ce6929b6ad3587936a3f89071e83541e01f1 Mon Sep 17 00:00:00 2001
From: Marcel Hild <hild@b4mad.net>
Date: Thu, 15 Dec 2016 12:25:47 +0100
Subject: [PATCH] move amazon settings to ManageIQ/manageiq-providers-amazon

---
 config/settings.yml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 386045dc3c8..fe660c6438b 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -101,9 +101,6 @@
       :read_timeout: 1.hour
   :ems_kubernetes:
     :miq_namespace: management-infra
-  :ems_amazon:
-    :disabled_regions: []
-    :additional_regions: {}
   :ems_azure:
     :disabled_regions: []
     :additional_regions: {}
@@ -113,17 +110,6 @@
     :purge_window_size: 1000
 :ems_refresh:
   :capture_vm_created_on_date: false
-  :ec2:
-    :get_private_images: true
-    :get_shared_images: true
-    :get_public_images: false
-    # configure an array of filters to be added to describe_images
-    # see: http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_images-instance_method
-    :public_images_filters:
-      - :name: image-type
-        :values:
-          - machine
-    :ignore_terminated_instances: true
   :ansible_tower_configuration:
     :refresh_interval: 15.minutes
   :foreman_configuration:
@@ -962,11 +948,6 @@
     :password:
     :port:
     :user:
-  :ec2:
-    :host:
-    :password:
-    :port:
-    :user:
 :ldap_synchronization:
   :ldap_synchronization_schedule: "0 2 * * *"
 :log:
@@ -991,8 +972,6 @@
     :ping_depot_timeout: 20
   :level: info
   :level_rails: info
-  :level_aws: info
-  :level_aws_in_evm: error
   :level_lenovo: info
   :level_lenovo_in_evm: error
   :level_azure: warn
@@ -1254,8 +1233,6 @@
         :amqp_recovery_attempts: 4
         :ceilometer:
           :event_types_regex: '\A(firewall|floatingip|gateway|net|port|router|subnet|security_group|vpn)'
-      :event_catcher_amazon:
-        :poll: 15.seconds
       :event_catcher_azure:
         :poll: 15.seconds
       :event_catcher_hawkular:
@@ -1288,7 +1265,6 @@
           :nice_delta: 3
           :poll_method: :escalate
         :ems_metrics_collector_worker_azure: {}
-        :ems_metrics_collector_worker_amazon: {}
         :ems_metrics_collector_worker_google: {}
         :ems_metrics_collector_worker_kubernetes:
           :metrics_port: 5000
@@ -1313,8 +1289,6 @@
           :poll_method: :normal
           :queue_timeout: 120.minutes
           :restart_interval: 2.hours
-        :ems_refresh_worker_amazon: {}
-        :ems_refresh_worker_amazon_network: {}
         :ems_refresh_worker_ansible_tower_configuration: {}
         :ems_refresh_worker_azure: {}
         :ems_refresh_worker_azure_network: {}