From 3a36b22644e4629ba617d19586abbacb123413e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 27 Sep 2011 11:41:55 +0200 Subject: [PATCH] Bug #832: Move Configuration.rb to onedb's lib location (cherry picked from commit fc6de1c4a02a3cf3dd7a1dbdbb1707dbbc141e73) --- install.sh | 6 +++--- src/{cloud/common => onedb}/Configuration.rb | 0 src/onedb/onedb.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/{cloud/common => onedb}/Configuration.rb (100%) diff --git a/install.sh b/install.sh index e6cdb3ea0a..23dc500a82 100755 --- a/install.sh +++ b/install.sh @@ -655,7 +655,8 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/2.9.85_to_2.9.90.rb \ src/onedb/2.9.90_to_3.0.rb \ src/onedb/onedb.rb \ - src/onedb/onedb_backend.rb" + src/onedb/onedb_backend.rb \ + src/onedb/Configuration.rb" #------------------------------------------------------------------------------- # Configuration files for OpenNebula, to be installed under $ETC_LOCATION @@ -793,8 +794,7 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/OpenNebula/Host.rb \ COMMON_CLOUD_LIB_FILES="src/cloud/common/CloudServer.rb \ src/cloud/common/CloudClient.rb \ - src/cloud/common/CloudAuth.rb \ - src/cloud/common/Configuration.rb" + src/cloud/common/CloudAuth.rb" COMMON_CLOUD_CLIENT_LIB_FILES="src/cloud/common/CloudClient.rb" diff --git a/src/cloud/common/Configuration.rb b/src/onedb/Configuration.rb similarity index 100% rename from src/cloud/common/Configuration.rb rename to src/onedb/Configuration.rb diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index 2d1210a55f..d528310b3b 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'cloud/Configuration' +require 'Configuration' require 'onedb_backend' class OneDB