M #-: minor changes in provision (#678)

OpenNebula · Jan 20, 2021 · aafdf3d · aafdf3d
1 parent 0df9ee4
commit aafdf3d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 128 deletions.
diff --git a/src/cli/oneprovision b/src/cli/oneprovision
@@ -19,20 +19,15 @@
 ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
-    LIB_LOCATION       = '/usr/lib/one'
-    RUBY_LIB_LOCATION  = '/usr/lib/one/ruby'
-    GEMS_LOCATION      = '/usr/share/one/gems'
-    REMOTES_LOCATION   = '/var/lib/one/remotes'
-    ANSIBLE_LOCATION   = '/usr/share/one/oneprovision/ansible'
-    PROVIDERS_LOCATION = '/usr/lib/one/oneprovision/lib/terraform/providers'
+    LIB_LOCATION      = '/usr/lib/one'
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
+    REMOTES_LOCATION  = '/var/lib/one/remotes'
 else
-    LIB_LOCATION       = ONE_LOCATION + '/lib'
-    RUBY_LIB_LOCATION  = ONE_LOCATION + '/lib/ruby'
-    GEMS_LOCATION      = ONE_LOCATION + '/share/gems'
-    REMOTES_LOCATION   = ONE_LOCATION + '/var/remotes'
-    ANSIBLE_LOCATION   = ONE_LOCATION + '/share/oneprovision/ansible'
-    PROVIDERS_LOCATION = ONE_LOCATION +
-                         '/lib/oneprovision/lib/terraform/providers'
+    LIB_LOCATION      = ONE_LOCATION + '/lib'
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+    REMOTES_LOCATION  = ONE_LOCATION + '/var/remotes'
 end
 
 if File.directory?(GEMS_LOCATION)

diff --git a/src/cli/oneprovision-template b/src/cli/oneprovision-template
@@ -23,13 +23,11 @@ if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
     GEMS_LOCATION     = '/usr/share/one/gems'
     REMOTES_LOCATION  = '/var/lib/one/remotes'
-    ANSIBLE_LOCATION  = '/usr/share/one/oneprovision/ansible'
 else
     LIB_LOCATION      = ONE_LOCATION + '/lib'
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
     REMOTES_LOCATION  = ONE_LOCATION + '/var/remotes'
-    ANSIBLE_LOCATION  = ONE_LOCATION + '/share/oneprovision/ansible'
 end
 
 if File.directory?(GEMS_LOCATION)

diff --git a/src/oneprovision/etc/packet_driver.conf b/src/oneprovision/etc/packet_driver.conf
diff --git a/src/oneprovision/etc/packet_plans.rb b/src/oneprovision/etc/packet_plans.rb
diff --git a/src/oneprovision/lib/provision/ansible.rb b/src/oneprovision/lib/provision/ansible.rb
@@ -23,6 +23,12 @@
 require 'erb'
 require 'ostruct'
 
+if !ONE_LOCATION
+    ANSIBLE_LOCATION = '/usr/share/one/oneprovision/ansible'
+else
+    ANSIBLE_LOCATION = ONE_LOCATION + '/share/oneprovision/ansible'
+end
+
 # Default provision parameters
 CONFIG_DEFAULTS = {
     'connection' => {

diff --git a/src/oneprovision/lib/provision/provision.rb b/src/oneprovision/lib/provision/provision.rb
@@ -197,6 +197,8 @@ def info_objects(object, update = false)
                         path = 'resource'
                     end
 
+                    return [] unless @body['provision'][path][object]
+
                     resource = Resource.object(object)
 
                     @body['provision'][path][object].each do |o|

diff --git a/src/oneprovision/lib/terraform/terraform.rb b/src/oneprovision/lib/terraform/terraform.rb
@@ -19,6 +19,13 @@
 require 'yaml'
 require 'zlib'
 
+if !ONE_LOCATION
+    PROVIDERS_LOCATION = '/usr/lib/one/oneprovision/lib/terraform/providers'
+else
+    PROVIDERS_LOCATION = ONE_LOCATION +
+                         '/lib/oneprovision/lib/terraform/providers'
+end
+
 # Module OneProvision
 module OneProvision