foreman_m2 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eda017018d40b73148d7b05aaee1dc6c25eddd0
-  data.tar.gz: 5b7ba80ac06e7e0105031645a0991bc4d9c255b7
+  metadata.gz: acc6ba3fbda205a2537a00accc2739a4c0d39bbe
+  data.tar.gz: 06b2b106b8855ad61410de951bb9e1e8bd2fb47a
 SHA512:
-  metadata.gz: a5000806742bad5274e479a175e8d653f9228cc1009ec57c8ba6b99b05f5275f7523e0ea59fbe9090696bac621c5c0eb80176897635294fcf6cb5dc6b8b344d8
-  data.tar.gz: ebf511961c43ff7603e4f0b55fc51bdecf2cf9536e0f508ebce488a5b9dc18ef8d65958ee11fc6cc2c39d821daa971a9f25f4d66a472863c28b468b558850a0b
+  metadata.gz: b5581626a602a9b87e1abb46be6d7167723d753d3ac8e6470415219b4187aea0129bd5e123401efa8942ec5cd296a219249fa3012f328e614f8ef3948b015d12
+  data.tar.gz: ff486e64dcc1da50c9b967fae5a09136ddae498cdae63de48082e4afa6311714e08c714f6470b6ff8080afc1784b4786aa70b1836d1e67263122c949823f050f

data/README.md

@@ -6,25 +6,29 @@ The Foreman M2 plugin introduces M2 functionality into Foreman.  This is current
 
 - TFTP & DHCP servers
 - Smart-Proxy plugin that has M2 among its capabilities (see link above)
-- Note: In 0.0.1, ensure that the M2 smart proxy is called "proxy_m2".  This will be addressed in the next release.
+- Note: In 0.0.1 & 0.0.2, ensure that the M2 smart proxy is called "proxy_m2".  This will be addressed in the next release.
 - Working M2 installation with images imported to the M2 project in use
+- Currently supports M2 commit 5b93852d3d1e73deecfa162fdc0b833ae84eb5a5
 
 ## Installation
 
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 for how to install Foreman plugins
 
+Be sure to run `rake db:seed` to seed the database.
+
 ## Usage
 
 1) Create an M2 compute resource
 2) Relate M2 provisioning templates to the M2 computer resource
 3) Create M2 images in the M2 compute resource
-4) Create host using M2 provider  **Note: make sure to select "Network & Image Based" provisioning method
+**NOTE: For now, ensure that the entered image name matches the one in the drop-down menu.**
+4) Create host using M2 provider  **Note: make sure to select "Network & Image Based" provisioning method.**
 
 ## TODO
 
-- Query for M2 smart proxy by some method other than its name
-  - Fix will be out in next release
+- ~~Query for M2 smart proxy by some method other than its name~~
+  - Fixed in 0.0.2
 - Testing
 - Disk management interface in Foreman
 

data/app/models/concerns/foreman_m2/host_extensions.rb

@@ -88,16 +88,21 @@ module ForemanM2
 
     def iscsi_target
       logger.info "Creating disk #{name}"
-      proxy = SmartProxy.find_by name: 'proxy_m2'
+      proxy = SmartProxy.find_by url: self.compute_resource.url
       proxyAPI = ::ProxyAPI::M2.new(url: proxy.url)
       img = Image.find_by name: image_name
-      # project = img.uuid
-      proxyAPI.get_iscsi_target(:disk => name, :image => image_name)
+      tgt = proxyAPI.get_iscsi_target(:disk => name, :image => image_name)
+      # If M2 returns that the image exists...
+      if tgt.include? "exists"
+        tgt.slice! "Disk exists. Endpoint:"
+        tgt
+      end
+
     end
 
     def destroy_disk
       logger.info "Destroying disk #{name}"
-      proxy = SmartProxy.find_by name: 'proxy_m2'
+      proxy = SmartProxy.find_by url: self.compute_resource.url
       proxyAPI = ::ProxyAPI::M2.new(url: proxy.url)
       proxyAPI.delete_iscsi_target(:disk => name)
     end

data/app/views/compute_resources/form/_m2.html.erb

@@ -1 +1,2 @@
-<%= text_f f, :url, :label => _("M2 Smart Proxy URL") %>
+<%= select_f f, :url, SmartProxy.all.each { |sp| sp.features.include? "M2" },
+  :url, :name, {}, {:label => _('M2 Smart Proxy URL'), :required => true} %>

data/app/views/compute_resources/show/_m2.html.erb

@@ -0,0 +1,4 @@
+<tr>
+    <td><%= _("Smart Proxy URL") %></td>
+    <td><%= @compute_resource.url %></td>
+</tr>

data/lib/foreman_m2/engine.rb

@@ -31,20 +31,9 @@ module ForemanM2
           permission :view_foreman_m2, :'foreman_m2/hosts' => [:new_action]
         end
 
-        # Add a new role called 'Discovery' if it doesn't exist
+        # Add a new role called 'ForemanM2' if it doesn't exist
         role 'ForemanM2', [:view_foreman_m2]
 
-        # add menu entry
-        menu :top_menu, :template,
-             url_hash: { controller: :'foreman_m2/hosts', action: :new_action },
-             caption: 'ForemanM2',
-             parent: :hosts_menu,
-             after: :hosts
-
-        # add dashboard widget
-        widget 'foreman_m2_widget', name: N_('Foreman plugin template widget'),
-                                    sizex: 4, sizey: 1
-
         provision_method 'hybrid', 'Network & Image Based'
       end
     end

data/lib/foreman_m2/version.rb

@@ -1,3 +1,3 @@
 module ForemanM2
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_m2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Ian Ballou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc