Revert "Implementation of ovirt modules (openshift#2540)" (openshift#…

…2680) This reverts commit 780875a.
sunzhaohua2 · Jun 26, 2023 · 44835c0 · 44835c0
1 parent 5c0fc7d
commit 44835c0
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 153 deletions.
diff --git a/Gemfile b/Gemfile
@@ -74,4 +74,3 @@ gem 'oga' # replacemen for nokogiri when we thought we can workaround it
 # gem 'terminal-table'
 gem 'parallel_tests'
 gem 'slack-ruby-client'
-gem 'ovirt-engine-sdk'
diff --git a/lib/bushslicer.rb b/lib/bushslicer.rb
@@ -20,7 +20,6 @@ module BushSlicer
   autoload :ARMRdu2, "launchers/a_r_m_rdu2"
   autoload :Rdu_IPI_BM, "launchers/rdu_ipi_bm"
   autoload :OCMCluster, "launchers/o_c_m_cluster"
-  autoload :Ovirt, "launchers/ovirt"
   autoload :EnvironmentLauncher, "launchers/environment_launcher"
   autoload :PolarShift, "polarshift/autoload"
 

diff --git a/lib/iaas/iaas.rb b/lib/iaas/iaas.rb
@@ -18,8 +18,6 @@ def self.select_provider(env)
           return {:type => "azure", :provider => self.init_azure(env)}
         when "VSphere"
           return {:type => "vsphere", :provider => nil}
-        when "Ovirt"
-          return {:type => "ovirt", :provider => self.init_ovirt(env)}
         when "None"
           return {:type => "none", :provider => nil}
         else
@@ -88,9 +86,5 @@ def self.init_azure(env)
         :resource_group => secret.value_of("azure_resourcegroup", user: :admin)
       )
     end
-
-    def self.init_ovirt(env)
-      return BushSlicer::Ovirt.new()
-    end
   end
 end
diff --git a/lib/launchers/cloud_helper.rb b/lib/launchers/cloud_helper.rb
@@ -45,8 +45,6 @@ def iaas_by_service(service_name)
           BushSlicer::ARMRdu2.new(service_name: service_name)
         when "rdu_ipi_bm"
           BushSlicer::Rdu_IPI_BM.new(service_name: service_name)
-        when "ovirt"
-          BushSlicer::Ovirt.new(service_name: service_name)
         else
           raise "unknown service type " \
             "#{conf[:services, service_name, :cloud_type]} for cloud " \

diff --git a/lib/launchers/ovirt.rb b/lib/launchers/ovirt.rb
diff --git a/tools/os_deps/deps.deb b/tools/os_deps/deps.deb
@@ -17,4 +17,3 @@ libssl-dev
 ansible
 libxml2-dev
 libcurl4-openssl-dev
-libcurl-dev
diff --git a/tools/os_deps/deps.dnf.fedora b/tools/os_deps/deps.dnf.fedora
@@ -17,6 +17,3 @@ ansible
 pyOpenSSL
 # needed for local ansible repo/dnf operations
 redhat-rpm-config
-
-libcurl-devel
-libxml2-devel
diff --git a/tools/os_deps/deps.yum.RHEL8 b/tools/os_deps/deps.yum.RHEL8
@@ -6,10 +6,8 @@ firefox
 gcc-c++
 git
 jq
-libcurl-devel
 libffi-devel
 libtool
-libxml2-devel
 make
 openssl-devel
 patch

diff --git a/tools/os_deps/deps.yum.fedora b/tools/os_deps/deps.yum.fedora
@@ -12,6 +12,3 @@ Xvfb
 
 ansible
 pyOpenSSL
-
-libcurl-devel
-libxml2-devel