ops_manager_cli 0.5.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e200f84440299495f24ab5116f42ee811619f202
-  data.tar.gz: 34f6349b50099e31de0995fc004d602a47712cdb
+  metadata.gz: 8992b156cebae9e672d078b6da9b8657a650b093
+  data.tar.gz: 70fab26214ffab2248756aa0e281fb287acd0e5e
 SHA512:
-  metadata.gz: adb1d901dd22f681e4f14e1d90a92216d978d650747f3359895a5db86b8ea13716a71608c8729dc653a7b373ea7532c103ce1e5b7f969e1e9f3ae9d071a1a54e
-  data.tar.gz: 3336b1e3aecfcc730fff8e74ddbd5f928640f3bff5047f690b83c63477b91f25695cb77b0c0441f675270324ee732b3e660a4e4cd4350601d624e34208dec29c
+  metadata.gz: c2e769b03f59448e5e415f141d2dac8d6009ae272c748c20aabb98b8c6ea6b70d38ada89d20c335e13daafe79fbb9ec9a44be775a7ca3750d69396a20459606e
+  data.tar.gz: 3ef3595a66344221983bdde63e1c770a3422453286656bdf572f2d8b4f66c6e8a4e01ed8549e2bd4672246c4f508e3d789fcee5542fd5f67acc69f138f07d201

data/CHANGELOG.md

@@ -1,17 +1,28 @@
 # Change Log
 
+## [v0.5.4](https://github.com/compozed/ops_manager_cli/tree/v0.5.4) (2017-06-27)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.3...v0.5.4)
+
+## [v0.5.3](https://github.com/compozed/ops_manager_cli/tree/v0.5.3) (2017-06-27)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.2...v0.5.3)
+
 ## [v0.5.2](https://github.com/compozed/ops_manager_cli/tree/v0.5.2) (2017-06-27)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.1...v0.5.2)
 
 **Closed issues:**
 
+- CLI should check that UAA is available after Ops Manager upgrades [\#29](https://github.com/compozed/ops_manager_cli/issues/29)
+- When upgrading opsman the token does not reset [\#27](https://github.com/compozed/ops_manager_cli/issues/27)
 - Support refresh tokens for re-authentication with UAA [\#24](https://github.com/compozed/ops_manager_cli/issues/24)
-- Upgrading product does not work with opsman\_cli 0.5.0 on opsman 1.9 [\#23](https://github.com/compozed/ops_manager_cli/issues/23)
 - Allow toggling ops\_manager.log [\#21](https://github.com/compozed/ops_manager_cli/issues/21)
 
 ## [v0.5.1](https://github.com/compozed/ops_manager_cli/tree/v0.5.1) (2017-01-25)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.0...v0.5.1)
 
+**Closed issues:**
+
+- Upgrading product does not work with opsman\_cli 0.5.0 on opsman 1.9 [\#23](https://github.com/compozed/ops_manager_cli/issues/23)
+
 ## [v0.5.0](https://github.com/compozed/ops_manager_cli/tree/v0.5.0) (2017-01-24)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.4.1...v0.5.0)
 
@@ -21,6 +32,7 @@
 
 **Closed issues:**
 
+- Upgrade does not merge product installation settings [\#22](https://github.com/compozed/ops_manager_cli/issues/22)
 - ops\_manager curl -x PUT not working [\#17](https://github.com/compozed/ops_manager_cli/issues/17)
 - When uploading stemcell it does not show the correct output [\#15](https://github.com/compozed/ops_manager_cli/issues/15)
 
@@ -30,6 +42,7 @@
 **Fixed bugs:**
 
 - Director template generator does not delete UAA sensitive data [\#13](https://github.com/compozed/ops_manager_cli/issues/13)
+- Product template generator does not delete stemcell metadata properties [\#12](https://github.com/compozed/ops_manager_cli/issues/12)
 
 ## [v0.4.0](https://github.com/compozed/ops_manager_cli/tree/v0.4.0) (2016-10-20)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.3.0...v0.4.0)
@@ -37,12 +50,14 @@
 **Implemented enhancements:**
 
 - Improve output for appliance deploy/upgrade [\#11](https://github.com/compozed/ops_manager_cli/issues/11)
+- Improve output for product deploy/upgrade [\#10](https://github.com/compozed/ops_manager_cli/issues/10)
 - Run errands when applying changes [\#9](https://github.com/compozed/ops_manager_cli/issues/9)
 - 1.8 support [\#5](https://github.com/compozed/ops_manager_cli/pull/5) ([bonzofenix](https://github.com/bonzofenix))
 
 **Fixed bugs:**
 
 - delete-unused-products command not working [\#8](https://github.com/compozed/ops_manager_cli/issues/8)
+- Hardcoded user name admin when logging agains ops\_manager [\#2](https://github.com/compozed/ops_manager_cli/issues/2)
 
 **Closed issues:**
 

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:2.3.0
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.5.4
+ENV GEM_VERSION 0.7.1
 ENV OVFTOOL_VERSION 4.1.0-2459827
 ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
 ARG DOWNLOAD_URL

data/lib/ops_manager/api/base.rb

@@ -154,6 +154,9 @@ class OpsManager
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           http.read_timeout = 1200
+
+          ctx = OpenSSL::SSL::SSLContext.new
+          ctx.ssl_version = :TLSv1_2
         end
       end
 

data/lib/ops_manager/api/opsman.rb

@@ -25,6 +25,10 @@ class OpsManager
         authenticated_get("/api/v0/staged/products", opts)
       end
 
+      def get_pending_changes(opts = {})
+        authenticated_get("/api/v0/staged/pending_changes", opts)
+      end
+
       def get_installation_settings(opts = {})
         print_green '====> Downloading installation settings ...'
         res = authenticated_get("/api/installation_settings", opts)
@@ -117,7 +121,7 @@ class OpsManager
 
       def get_diagnostic_report
         authenticated_get("/api/v0/diagnostic_report")
-      rescue Errno::ETIMEDOUT , Errno::EHOSTUNREACH, Net::HTTPFatalError, Net::OpenTimeout
+      rescue Errno::ETIMEDOUT , Errno::EHOSTUNREACH, Net::HTTPFatalError, Net::OpenTimeout, HTTPClient::ConnectTimeoutError
         nil
       end
 
@@ -153,6 +157,23 @@ class OpsManager
         nil
       end
 
+      def pending_changes(opts = {})
+        print_green '====> Getting pending changes ...'
+        res = authenticated_get('/api/v0/staged/pending_changes')
+        pendingChanges = JSON.parse(res.body)
+
+        if pendingChanges['product_changes'].count == 0
+          puts "\nNo pending changes"
+        else
+          pendingChanges['product_changes'].each do |product|
+            puts "\n#{product['guid']}"
+          end
+        end
+
+        say_green 'done'
+        res
+      end
+
       def username
         @username ||= OpsManager.get_conf(:username)
       end
@@ -174,7 +195,23 @@ class OpsManager
         @access_token ||= get_token.info['access_token']
       end
 
+      def wait_for_https_alive(limit)
+        @retry_counter = 0
+        res = nil
+        until(@retry_counter >= limit or (res = check_alive).code.to_i < 400) do
+          sleep 1
+          @retry_counter += 1
+        end
+        res
+      end
+
       private
+      def check_alive
+        get("/")
+      rescue Net::OpenTimeout, Net::HTTPError, Net::HTTPFatalError, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET => e
+        Net::HTTPInternalServerError.new(1.0, 500, e.inspect)
+      end
+
       def token_issuer
         @token_issuer ||= CF::UAA::TokenIssuer.new(
           "https://#{target}/uaa", 'opsman', nil, skip_ssl_validation: true )

data/lib/ops_manager/appliance/aws.rb

@@ -0,0 +1,89 @@
+require 'fog/aws'
+require 'ops_manager/appliance/base'
+
+class OpsManager
+  module Appliance
+    class AWS < Base
+
+      def deploy_vm
+        image_id = ::YAML.load_file(ami_mapping_file)[config[:opts][:region]]
+
+        server = connection.servers.create(
+          block_device_mapping: [{
+            'DeviceName'     => '/dev/xvda',
+            'Ebs.VolumeSize' => config[:opts][:disk_size_in_gb],
+          }],
+          key_name: config[:opts][:ssh_keypair_name],
+          flavor_id: config[:opts][:instance_type],
+          subnet_id: config[:opts][:subnet_id],
+          image_id: image_id,
+          private_ip_address: config[:ip],
+          security_group_ids: security_group_ids,
+          availability_zone: config[:opts][:availability_zone],
+          iam_instance_profile_name: config[:opts][:instance_profile_name],
+          tags: {
+            'Name' => vm_name,
+          }
+        )
+        server.wait_for { ready? }
+        return server
+      end
+
+      def stop_current_vm(name)
+        server = connection.servers.all("private-ip-address" => config[:ip], "tag:Name" => name).first
+        if ! server
+          fail "VM not found matching IP '#{config[:ip]}', named '#{name}'"
+        end
+        server.stop
+        server.wait_for { server.state == "stopped" }
+
+        # Create ami of stopped server
+        response = connection.create_image(server.id, "#{name}-backup", "Backup of #{name}")
+        image = connection.images.get( response.data[:body]['imageId'])
+        image.wait_for { image.state == "available" }
+        if image.state != "available"
+          fail "Error creating backup AMI, bailing out before destroying the VM"
+        end
+
+        puts "Saved #{name} to AMI #{image.id} (#{name}-backup) for safe-keeping"
+
+        server.destroy
+        if !Fog.mocking?
+          server.wait_for { server.state == 'terminated' }
+        else
+          # Fog's mock doesn't support transitioning state from terminating -> terminated
+          # so we have to hack this here
+          server.wait_for { server.state == 'terminating' }
+        end
+      end
+
+      private
+      def ami_mapping_file
+        Dir.glob(config[:opts][:ami_mapping_file]).first
+      end
+
+      def security_group_ids
+        config[:opts][:security_groups].collect do |sg|
+          connection.security_groups.get(sg).group_id
+        end
+      end
+
+      def connection
+        if config[:opts][:use_iam_profile]
+          @connection ||= Fog::Compute.new({
+            provider: config[:provider],
+            use_iam_profile: config[:opts][:use_iam_profile],
+            aws_access_key_id: "",
+            aws_secret_access_key: "",
+          })
+        else
+          @connection ||= Fog::Compute.new({
+            provider: config[:provider],
+            aws_access_key_id: config[:opts][:access_key],
+            aws_secret_access_key: config[:opts][:secret_key],
+          })
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager/appliance/base.rb

@@ -0,0 +1,23 @@
+
+class OpsManager
+  module Appliance
+    class Base
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
+      end
+      def deploy_vm
+        raise NotImplementedError.new("You must implement deploy_vm.")
+      end
+      def stop_current_vm(name)
+        raise NotImplementedError.new("You must implement stop_current_vm.")
+      end
+
+      private
+      def vm_name
+        @vm_name ||= "#{config[:name]}-#{config[:desired_version]}"
+      end
+    end
+  end
+end

data/lib/ops_manager/appliance/vsphere.rb

@@ -0,0 +1,47 @@
+require 'rbvmomi'
+require "uri"
+require 'shellwords'
+require "ops_manager/logging"
+require 'ops_manager/appliance/base'
+
+class OpsManager
+  module Appliance
+    class Vsphere < Base
+      include OpsManager::Logging
+      attr_reader :config
+
+      def deploy_vm
+        print '====> Deploying ova ...'.green
+        vcenter_target= "vi://#{vcenter_username}:#{vcenter_password}@#{config[:opts][:vcenter][:host]}/#{config[:opts][:vcenter][:datacenter]}/host/#{config[:opts][:vcenter][:cluster]}"
+        cmd = "echo yes | ovftool --acceptAllEulas --noSSLVerify --powerOn --X:waitForIp --net:\"Network 1=#{config[:opts][:portgroup]}\" --name=#{vm_name} -ds=#{config[:opts][:datastore]} --prop:ip0=#{config[:ip]} --prop:netmask0=#{config[:opts][:netmask]}  --prop:gateway=#{config[:opts][:gateway]} --prop:DNS=#{config[:opts][:dns]} --prop:ntp_servers=#{config[:opts][:ntp_servers].join(',')} --prop:admin_password=#{config[:password]} #{config[:opts][:ova_path]} #{vcenter_target}"
+        logger.info "Running: #{cmd}"
+        logger.info `#{cmd}`
+        puts 'done'.green
+      end
+
+      def stop_current_vm(name)
+        print "====> Stopping vm #{name} ...".green
+        dc = vim.serviceInstance.find_datacenter(config[:opts][:vcenter][:datacenter])
+        logger.info "finding vm: #{name}"
+        vm = dc.find_vm(name) or fail "VM not found"
+        vm.PowerOffVM_Task.wait_for_completion
+        puts 'done'.green
+      end
+
+      private
+      def vim
+        RbVmomi::VIM.connect host: config[:opts][:vcenter][:host], user: URI.unescape(config[:opts][:vcenter][:username]), password: URI.unescape(config[:opts][:vcenter][:password]), insecure: true
+      end
+
+      def vcenter_username
+        Shellwords.escape(URI.encode(config[:opts][:vcenter][:username]))
+      end
+
+      def vcenter_password
+        Shellwords.escape(URI.encode(config[:opts][:vcenter][:password]))
+      end
+    end
+  end
+end
+
+

data/lib/ops_manager/appliance_deployment.rb

@@ -1,15 +1,18 @@
 require "ops_manager/api/opsman"
 require "ops_manager/api/pivnet"
-require 'ops_manager/configs/opsman_deployment'
+require 'ops_manager/config/opsman_deployment'
 require 'fileutils'
 
 class OpsManager::ApplianceDeployment
   extend Forwardable
+  attr_reader :config
+
   def_delegators :pivnet_api, :get_product_releases, :accept_product_release_eula,
     :get_product_release_files, :download_product_release_file
-  def_delegators :opsman_api, :create_user, :trigger_installation, :get_installation_assets,
+  def_delegators :opsman_api, :create_user, :get_installation_assets,
     :get_installation_settings, :get_diagnostic_report, :upload_installation_assets, :get_ensure_availability,
-    :import_stemcell, :target, :password, :username, :ops_manager_version= , :reset_access_token
+    :import_stemcell, :target, :password, :username, :ops_manager_version= , :reset_access_token, :get_pending_changes,
+    :wait_for_https_alive
 
   attr_reader :config_file
 
@@ -18,35 +21,37 @@ class OpsManager::ApplianceDeployment
   end
 
   def run
-    OpsManager.set_conf(:target, config.ip)
-    OpsManager.set_conf(:username, config.username)
-    OpsManager.set_conf(:password, config.password)
-    OpsManager.set_conf(:pivnet_token, config.pivnet_token)
+    OpsManager.set_conf(:target, config[:ip])
+    OpsManager.set_conf(:username, config[:username])
+    OpsManager.set_conf(:password, config[:password])
+    OpsManager.set_conf(:pivnet_token, config[:pivnet_token])
 
-    self.extend(OpsManager::Deployments::Vsphere)
 
     case
     when current_version.empty?
-      puts "No OpsManager deployed at #{config.ip}. Deploying ...".green
+      puts "No OpsManager deployed at #{config[:ip]}. Deploying ...".green
       deploy
       create_first_user
     when current_version < desired_version then
-      puts "OpsManager at #{config.ip} version is #{current_version}. Upgrading to #{desired_version} .../".green
+      puts "OpsManager at #{config[:ip]} version is #{current_version}. Upgrading to #{desired_version} .../".green
       upgrade
     when current_version == desired_version then
-      puts "OpsManager at #{config.ip} version is already #{config.desired_version}. Skiping ...".green
+      if pending_changes?
+        puts "OpsManager at #{config[:ip]} version has pending changes. Applying changes...".green
+        OpsManager::InstallationRunner.trigger!.wait_for_result
+      else
+        puts "OpsManager at #{config[:ip]} version is already #{config[:desired_version]}. Skiping ...".green
+      end
     end
 
     puts '====> Finish!'.green
   end
 
-  def deploy
-    deploy_vm(desired_vm_name , config.ip)
-  end
-
-  %w{ stop_current_vm deploy_vm }.each do |m|
-    define_method(m) do
-      raise NotImplementedError
+  def appliance 
+    @appliance ||= if config[:provider] =~/vsphere/i
+      OpsManager::Appliance::Vsphere.new(config)
+    else
+      OpsManager::Appliance::AWS.new(config)
     end
   end
 
@@ -57,10 +62,15 @@ class OpsManager::ApplianceDeployment
     end
   end
 
+  def deploy
+    appliance.deploy_vm
+    wait_for_https_alive 300
+  end
+
   def upgrade
     get_installation_assets
     download_current_stemcells
-    stop_current_vm(current_vm_name)
+    appliance.stop_current_vm(current_name)
     deploy
     upload_installation_assets
     wait_for_uaa
@@ -113,21 +123,30 @@ class OpsManager::ApplianceDeployment
     list_current_stemcells.each do |stemcell_version|
       release_id = find_stemcell_release(stemcell_version)
       accept_product_release_eula('stemcells', release_id )
-      file_id, file_name = find_stemcell_file(release_id, /vsphere/)
+      stemcell_regex = /vsphere/
+      if config[:provider] == "AWS"
+        stemcell_regex = /aws/
+      end
+
+      file_id, file_name = find_stemcell_file(release_id, stemcell_regex)
       download_product_release_file('stemcells', release_id, file_id, write_to: "#{current_stemcell_dir}/#{file_name}")
     end
   end
 
   def new_vm_name
-    @new_vm_name ||= "#{config.name}-#{config.desired_version}"
+    @new_vm_name ||= "#{config[:name]}-#{config[:desired_version]}"
   end
 
   def current_version
     @current_version ||= OpsManager::Semver.new(version_from_diagnostic_report)
   end
 
+  def current_name
+    @current_name ||= "#{config[:name]}-#{current_version}"
+  end
+
   def desired_version
-    @desired_version ||= OpsManager::Semver.new(config.desired_version)
+    @desired_version ||= OpsManager::Semver.new(config[:desired_version])
   end
 
   def provision_stemcells
@@ -167,12 +186,9 @@ class OpsManager::ApplianceDeployment
   end
 
   def current_vm_name
-    @current_vm_name ||= "#{config.name}-#{current_version}"
+    @current_vm_name ||= "#{config[:name]}-#{current_version}"
   end
 
-  def desired_vm_name
-    @desired_vm_name ||= "#{config.name}-#{config.desired_version}"
-  end
 
   def pivnet_api
     @pivnet_api ||= OpsManager::Api::Pivnet.new
@@ -183,10 +199,10 @@ class OpsManager::ApplianceDeployment
   end
 
   def config
-    parsed_yml = ::YAML.load_file(@config_file)
-    @config ||= OpsManager::Configs::OpsmanDeployment.new(parsed_yml)
+    @config ||= OpsManager::Config::OpsmanDeployment.new(YAML.load_file(@config_file))
   end
 
+
   def desired_version?(version)
     !!(desired_version.to_s =~/#{version}/)
   end
@@ -206,4 +222,8 @@ class OpsManager::ApplianceDeployment
   def current_stemcell_dir
     "/tmp/current_stemcells"
   end
+
+  def pending_changes?
+    !JSON.parse(get_pending_changes.body).fetch('product_changes').empty?
+  end
 end

data/lib/ops_manager/cli.rb

@@ -72,6 +72,12 @@ class OpsManager
       end
     end
 
+    class PendingChanges < Clamp::Command
+      def execute
+        OpsManager::Api::Opsman.new.pending_changes
+      end
+    end
+
     class DeleteUnusedProducts < Clamp::Command
 
       def execute
@@ -158,6 +164,7 @@ class OpsManager
     subcommand "get-installation-settings", "Gets installation settings", GetInstallationSettings
     subcommand "get-installation-logs", "Gets installation logs", GetInstallationLogs
     subcommand "import-stemcell", "Uploads stemcell to OpsManager", ImportStemcell
+    subcommand "pending-changes", "View pending changes in OpsManager", PendingChanges
 
   end
 end

data/lib/ops_manager/config/base.rb

@@ -0,0 +1,42 @@
+require 'ostruct'
+
+class OpsManager
+  module Config
+    class Base < OpenStruct
+      def initialize(config)
+        super(config.to_symbolize)
+      end
+
+      def validate_presence_of!(*attrs)
+        attrs.each do |attr|
+          raise "missing #{attr} on config" unless self.to_h.has_key?(attr)
+        end
+      end
+
+      def expand_path_for!(*attrs)
+        attrs.each do |attr|
+          path = self[attr] 
+          self[attr] = if path =~ %r{^file://}
+            path = Dir.glob(path.gsub!('file://','')).first
+            "file://#{path}"
+          else
+            Dir.glob(path).first
+          end
+        end
+      end
+    end
+  end
+end
+
+class Hash 
+  def to_symbolize
+      Hash[self.map do |k, v| 
+      if v.kind_of?(Hash) 
+        [k.to_sym, v.to_symbolize]
+      else
+        [k.to_sym, v]
+      end
+    end]
+  end
+end
+

data/lib/ops_manager/{configs → config}/opsman_deployment.rb

@@ -1,7 +1,7 @@
-require 'ops_manager/configs/base'
+require 'ops_manager/config/base'
 
 class OpsManager
-  class Configs
+  module Config
     class OpsmanDeployment < Base
       def initialize(config)
         super(config)

data/lib/ops_manager/config/product_deployment.rb

@@ -0,0 +1,13 @@
+require 'ops_manager/config/base'
+
+class OpsManager
+  module Config
+    class ProductDeployment < Base
+      def initialize(config)
+        super(config)
+        validate_presence_of! :name, :desired_version 
+        expand_path_for! :stemcell
+      end
+    end
+  end
+end

data/lib/ops_manager/configs/base.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 
 class OpsManager
   class Configs
-    class Base < OpenStruct
+    class Base < Hash
       def initialize(config)
         @config = config
         super(config)

data/lib/ops_manager/installation_runner.rb

@@ -6,7 +6,7 @@ class OpsManager
     attr_reader :id
 
     def trigger!
-      res = trigger_installation( body: body )
+      res = trigger_installation( :headers => {"Content-Type"=>"application/json"}, :body => body )
       @id = JSON.parse(res.body).fetch('install').fetch('id').to_i
       self
     end
@@ -25,27 +25,19 @@ class OpsManager
 
     private
     def body
-      @body ||= [ 'ignore_warnings=true' ]
-      @body << errands_body
-      @body.join('&')
+      @body ||= {'errands' => errands, 'ignore_warnings' => true }.to_json
     end
-
     def opsman_api
       @opsman_api ||= OpsManager::Api::Opsman.new
     end
 
-    def errands_body
-      staged_products_guids.collect { |product_guid| post_deploy_errands_body_for(product_guid) }
-    end
-
-    def post_deploy_errands_body_for(product_guid)
-      post_deploy_errands = post_deploy_errands_for(product_guid)
-
-      if post_deploy_errands.empty?
-        "enabled_errands[#{product_guid}]{}"
-      else
-        post_deploy_errands.collect{ |e| "enabled_errands[#{product_guid}][post_deploy_errands][]=#{e}" }
+    def errands
+      res = { }
+      staged_products_guids.each do |product_guid|
+        errands = errands_for(product_guid).keep_if { |an_errand| an_errand['post_deploy'] }
+        errands.each { |e| res[product_guid] = {'run_post_deploy' => { e['name'] => true}}}
       end
+      res
     end
 
     def staged_products_guids
@@ -56,9 +48,6 @@ class OpsManager
       JSON.parse(get_staged_products.body)
     end
 
-    def post_deploy_errands_for(product_guid)
-      errands_for(product_guid).keep_if{ |errand| errand['post_deploy'] }.map{ |o| o['name']}
-    end
 
     def errands_for(product_guid)
       res = get_staged_products_errands(product_guid)

data/lib/ops_manager/product_deployment.rb

@@ -7,6 +7,8 @@ require "ops_manager/semver"
 class OpsManager
   class ProductDeployment
     extend Forwardable
+    attr_reader :config
+
     def_delegators :opsman_api, :current_version, :upload_product, :get_installation_settings,
       :upgrade_product_installation, :get_installation, :get_available_products, :upload_installation_settings,
       :trigger_installation, :import_stemcell, :add_staged_products
@@ -19,12 +21,12 @@ class OpsManager
     end
 
     def installation
-      OpsManager::ProductInstallation.find(config.name)
+      OpsManager::ProductInstallation.find(config[:name])
     end
 
     def run
-      OpsManager.target_and_login(config.target, config.username, config.password)
-      import_stemcell(config.stemcell)
+      OpsManager.target_and_login(config[:target], config[:username], config[:password])
+      import_stemcell(config[:stemcell])
 
       case
       when installation.nil? || forced_deployment?
@@ -37,15 +39,15 @@ class OpsManager
     end
 
     def desired_version
-      Semver.new(config.desired_version)
+      Semver.new(config[:desired_version])
     end
 
     def upload
       print "====> Uploading product ...".green
-      if ProductDeployment.exists?(config.name, config.desired_version)
+      if ProductDeployment.exists?(config[:name], config[:desired_version])
         puts "product already exists".green
-      elsif config.filepath
-        upload_product(config.filepath)
+      elsif config[:filepath]
+        upload_product(config[:filepath])
         puts "done".green
       else
         puts "no filepath provided, skipping product upload.".green
@@ -57,9 +59,9 @@ class OpsManager
         puts "====> Skipping as this product has a pending installation!".red
         return
       end
-      puts "====> Upgrading #{config.name} version from #{installation.current_version.to_s} to #{config.desired_version}...".green
+      puts "====> Upgrading #{config[:name]} version from #{installation.current_version.to_s} to #{config[:desired_version]}...".green
       upload
-      upgrade_product_installation(installation.guid, config.desired_version)
+      upgrade_product_installation(installation.guid, config[:desired_version])
       merge_product_installation_settings
       OpsManager::InstallationRunner.trigger!.wait_for_result
 
@@ -68,12 +70,12 @@ class OpsManager
 
     def add_to_installation
       unless installation
-        add_staged_products(config.name, config.desired_version)
+        add_staged_products(config[:name], config[:desired_version])
       end
     end
 
     def deploy
-      puts "====> Deploying #{config.name} version #{config.desired_version}...".green
+      puts "====> Deploying #{config[:name]} version #{config[:desired_version]}...".green
       upload
       add_to_installation
       merge_product_installation_settings
@@ -85,7 +87,7 @@ class OpsManager
 
     def merge_product_installation_settings
       get_installation_settings({write_to: '/tmp/is.yml'})
-      puts `DEBUG=false spruce merge /tmp/is.yml #{config.installation_settings_file} > /tmp/new_is.yml`
+      puts `DEBUG=false spruce merge /tmp/is.yml #{config[:installation_settings_file]} > /tmp/new_is.yml`
       upload_installation_settings('/tmp/new_is.yml')
     end
 
@@ -96,7 +98,7 @@ class OpsManager
 
     private
     def desired_version
-      @desired_version ||= OpsManager::Semver.new(config.desired_version)
+      @desired_version ||= OpsManager::Semver.new(config[:desired_version])
     end
 
     def forced_deployment?
@@ -108,7 +110,7 @@ class OpsManager
     end
 
     def config
-      OpsManager::Configs::ProductDeployment.new(::YAML.load_file(@config_file))
+      OpsManager::Config::ProductDeployment.new(::YAML.load_file(@config_file))
     end
   end
 end

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.5.4"
+  VERSION = "0.7.1"
 end

data/lib/ops_manager.rb

@@ -83,9 +83,10 @@ end
 
 require "ops_manager/version"
 require "ops_manager/semver"
-require "ops_manager/deployments/vsphere"
-require 'ops_manager/configs/product_deployment'
-require 'ops_manager/configs/opsman_deployment'
+require "ops_manager/appliance/vsphere"
+require "ops_manager/appliance/aws"
+require 'ops_manager/config/product_deployment'
+require 'ops_manager/config/opsman_deployment'
 require "ops_manager/cli"
 require "ops_manager/errors"
 require "net/https"

data/ops_manager.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rbvmomi"
   spec.add_dependency "multipart-post"
   spec.add_dependency "clamp"
+  spec.add_dependency "fog-aws"
   spec.add_dependency "net-ping"
   spec.add_dependency "cf-uaa-lib"
   spec.add_dependency "session_config"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.7.1
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +232,15 @@ files:
 - lib/ops_manager/api/base.rb
 - lib/ops_manager/api/opsman.rb
 - lib/ops_manager/api/pivnet.rb
+- lib/ops_manager/appliance/aws.rb
+- lib/ops_manager/appliance/base.rb
+- lib/ops_manager/appliance/vsphere.rb
 - lib/ops_manager/appliance_deployment.rb
 - lib/ops_manager/cli.rb
+- lib/ops_manager/config/base.rb
+- lib/ops_manager/config/opsman_deployment.rb
+- lib/ops_manager/config/product_deployment.rb
 - lib/ops_manager/configs/base.rb
-- lib/ops_manager/configs/opsman_deployment.rb
-- lib/ops_manager/configs/product_deployment.rb
-- lib/ops_manager/deployments/vsphere.rb
 - lib/ops_manager/director_template_generator.rb
 - lib/ops_manager/errors.rb
 - lib/ops_manager/installation.rb

data/lib/ops_manager/configs/product_deployment.rb

@@ -1,16 +0,0 @@
-require 'ops_manager/configs/base'
-
-class OpsManager
-  class Configs
-    class ProductDeployment < Base
-      def initialize(config)
-        super(config)
-        validate_presence_of!(:name, :desired_version)
-      end
-
-      def stemcell
-        find_full_path(@config['stemcell'])
-      end
-    end
-  end
-end

data/lib/ops_manager/deployments/vsphere.rb

@@ -1,45 +0,0 @@
-require 'rbvmomi'
-require "uri"
-require 'shellwords'
-require "ops_manager/logging"
-
-class OpsManager
-  module Deployments
-    module Vsphere
-      include OpsManager::Logging
-
-      def deploy_vm(name, ip)
-        print '====> Deploying ova ...'.green
-        vcenter_target= "vi://#{vcenter_username}:#{vcenter_password}@#{config.opts['vcenter']['host']}/#{config.opts['vcenter']['datacenter']}/host/#{config.opts['vcenter']['cluster']}"
-        cmd = "echo yes | ovftool --acceptAllEulas --noSSLVerify --powerOn --X:waitForIp --net:\"Network 1=#{config.opts['portgroup']}\" --name=#{name} -ds=#{config.opts['datastore']} --prop:ip0=#{ip} --prop:netmask0=#{config.opts['netmask']}  --prop:gateway=#{config.opts['gateway']} --prop:DNS=#{config.opts['dns']} --prop:ntp_servers=#{config.opts['ntp_servers'].join(',')} --prop:admin_password=#{config.password} #{config.opts['ova_path']} #{vcenter_target}"
-        logger.info "Running: #{cmd}"
-        logger.info `#{cmd}`
-        puts 'done'.green
-      end
-
-      def stop_current_vm(name)
-        print "====> Stopping vm #{name} ...".green
-        dc = vim.serviceInstance.find_datacenter(config.opts['vcenter']['datacenter'])
-        logger.info "finding vm: #{name}"
-        vm = dc.find_vm(name) or fail "VM not found"
-        vm.PowerOffVM_Task.wait_for_completion
-        puts 'done'.green
-      end
-
-      private
-      def vim
-        RbVmomi::VIM.connect host: config.opts['vcenter']['host'], user: URI.unescape(config.opts['vcenter']['username']), password: URI.unescape(config.opts['vcenter']['password']), insecure: true
-      end
-
-      def vcenter_username
-        Shellwords.escape(URI.encode(config.opts['vcenter']['username']))
-      end
-
-      def vcenter_password
-        Shellwords.escape(URI.encode(config.opts['vcenter']['password']))
-      end
-    end
-  end
-end
-
-