ops_manager_cli 0.7.1 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8992b156cebae9e672d078b6da9b8657a650b093
-  data.tar.gz: 70fab26214ffab2248756aa0e281fb287acd0e5e
+  metadata.gz: ee5a9bff7eaf8b7173c9e4e4b5d2bfa95cad310e
+  data.tar.gz: 9f167f4715184828677892aabbfcf6f2bf0c2bce
 SHA512:
-  metadata.gz: c2e769b03f59448e5e415f141d2dac8d6009ae272c748c20aabb98b8c6ea6b70d38ada89d20c335e13daafe79fbb9ec9a44be775a7ca3750d69396a20459606e
-  data.tar.gz: 3ef3595a66344221983bdde63e1c770a3422453286656bdf572f2d8b4f66c6e8a4e01ed8549e2bd4672246c4f508e3d789fcee5542fd5f67acc69f138f07d201
+  metadata.gz: e435c487df21a31cd91e5b2eb1f96faa8e55b11470f4b156d821de0829ef45e084c117ba009e9aa69be64e29c05014b63a18643ea21b3040c5200837d0af6d93
+  data.tar.gz: 295e443dd6b68eb53ef2f882cc8169e4dc8cc6d7deafe59c90b72ce31674d6875d01c593914c957f287044d3a7056039ee0bfd9ca8331d100ebbcde6dca492c0

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.1

data/CHANGELOG.md

@@ -1,5 +1,101 @@
 # Change Log
 
+
+## [v0.7.14](https://github.com/compozed/ops_manager_cli/tree/v0.7.14 (2019-01-21)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.13...v0.7.14)
+
+AWS appliance deployments no longer require the `ami_mapping_file`. Instead you must do
+the mapping lookup (if needed) prior to calling opsman, and pass it an explicit `image_id`
+option, pointing `ops_manager_cli` at a custom AMI. This allows it to easily support deploying
+OpsManager using an encrypted AMI.
+
+## [v0.7.13](https://github.com/compozed/ops_manager_cli/tree/v0.7.13 (2019-01-08)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.12...v0.7.13)
+
+Fixes a bug when upgrading an opsmanager VM that has Xenial stemcells on it
+
+## [v0.7.12]://github.com/compozed/ops_manager_cli/tree/v0.7.12) (2018-10-29)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.11...v0.7.12)
+
+- Adds support for deploying multiple tiles (but not all) at once. This is useful for
+  scenarios like deploying PAS at the same time as Isolation Segments or Windows Runtime
+  tiles. Instead of specifying `single_tile_deployment` in your config, specify `selected_deployments`,
+  with its value being a list of all product guids to deploy:
+
+```
+selected_deployments:
+- product-guid-1234
+- other-product-5678
+```
+
+
+## [v0.7.11]://github.com/compozed/ops_manager_cli/tree/v0.7.11) (2018-10-16)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.10...v0.7.11)
+
+- Hides VM extensions from get-director-template and get-product-template commands, so
+  that they can be managed via the `resource_config` + `vm_extensions` apis in Ops Manager
+  separately.
+
+## [v0.7.10]://github.com/compozed/ops_manager_cli/tree/v0.7.10) (2018-10-8)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.9...v0.7.10)
+
+- Fixes a bug uploading stemcells when using single-tile-deployments causing all tiles to
+  be assigned a stemcell, instead of the deployment targeted with single-tile-deployments
+- Support handling CF::UAA::HTTPException when checking for existing Ops Managers
+- Re-resolve bug related to deploying to AWS using instance profiles based on new Fog code
+
+## [v0.7.9]://github.com/compozed/ops_manager_cli/tree/v0.7.9) (2018-06-18)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.8...v0.7.9)
+
+- Adds error checking when ovftool fails to deploy the OVA to VCenter.
+
+## [v0.7.8]://github.com/compozed/ops_manager_cli/tree/v0.7.8) (2018-06-18)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.6...v0.7.8)
+
+- `ops_manager` now supports single-product deployments via the `deploy_products` key in the
+  Ops Manager API (requires Ops Manager 2.2+). Just add `single_tile_deploy: true` to the deploy
+  config file.
+
+## [v0.7.6](https://github.com/compozed/ops_manager_cli/tree/v0.7.6) (2018-06-18)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.5...v0.7.6)
+
+**Closed issues:**
+
+- Upgrading Product Issue - The enabled\_errands parameter is no longer supported [\#35](https://github.com/compozed/ops_manager_cli/issues/35)
+- Ops Manager cannot deploy appliance when there is no Ops Manager appliance deployed [\#31](https://github.com/compozed/ops_manager_cli/issues/31)
+- OpsMAnagerCli should check if there are pending changes in the current installation before performing an opsman upgrade [\#30](https://github.com/compozed/ops_manager_cli/issues/30)
+- director generator does not remove fixed stemcell versions [\#18](https://github.com/compozed/ops_manager_cli/issues/18)
+- Remove ovftools dependency and use rbvmomi instead to deploy appliance [\#14](https://github.com/compozed/ops_manager_cli/issues/14)
+
+**Merged pull requests:**
+
+- Make it work with ruby other than 2.4 [\#38](https://github.com/compozed/ops_manager_cli/pull/38) ([teancom](https://github.com/teancom))
+- Remove pem values from product templates [\#37](https://github.com/compozed/ops_manager_cli/pull/37) ([suppalapati13](https://github.com/suppalapati13))
+
+## [v0.7.5](https://github.com/compozed/ops_manager_cli/tree/v0.7.5) (2018-01-18)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.4...v0.7.5)
+
+## [v0.7.4](https://github.com/compozed/ops_manager_cli/tree/v0.7.4) (2017-11-22)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.2...v0.7.4)
+
+## [v0.7.2](https://github.com/compozed/ops_manager_cli/tree/v0.7.2) (2017-11-03)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.1...v0.7.2)
+
+## [v0.7.1](https://github.com/compozed/ops_manager_cli/tree/v0.7.1) (2017-10-25)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.0...v0.7.1)
+
+## [v0.7.0](https://github.com/compozed/ops_manager_cli/tree/v0.7.0) (2017-10-20)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.4...v0.7.0)
+
+**Closed issues:**
+
+- OpsMAnagerCli should support new errands endpoint in versions \>= 1.10 [\#32](https://github.com/compozed/ops_manager_cli/issues/32)
+
+**Merged pull requests:**
+
+- Added support for ops\_manager\_cli to deploy via AWS [\#34](https://github.com/compozed/ops_manager_cli/pull/34) ([geofffranks](https://github.com/geofffranks))
+- Add pending-changes CLI command [\#26](https://github.com/compozed/ops_manager_cli/pull/26) ([RMeharg](https://github.com/RMeharg))
+
 ## [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)
 
@@ -81,4 +177,4 @@
 ## [v0.1.1](https://github.com/compozed/ops_manager_cli/tree/v0.1.1) (2016-05-06)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Dockerfile

@@ -1,29 +1,38 @@
-FROM ruby:2.3.0
+FROM ruby:2.4.1
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.7.1
-ENV OVFTOOL_VERSION 4.1.0-2459827
+ENV GEM_VERSION 0.7.14
+ENV SPRUCE_VERSION 1.19.1
+ENV JQ_VERSION 1.5
+ENV OM_VERSION 0.42.0
+ENV OVFTOOL_VERSION 4.3.0-7948156
 ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
 ARG DOWNLOAD_URL
 
+# ================== Installs sshpass ===============
+#RUN echo "deb http://httpredir.debian.org/debian jessie utils" >> sources.list
+RUN apt-get update \
+ && apt-get install -y sshpass unzip \
+ && rm -rf /var/lib/apt/lists/*
+
 # ================== Installs OVF tools ==============
-RUN echo $DOWNLOAD_URL
-RUN wget -v ${DOWNLOAD_URL} \
-  && sh ${OVFTOOL_INSTALLER} -p /usr/local --eulas-agreed --required \
-  && rm -f ${OVFTOOL_INSTALLER}*
+RUN wget -q --no-check-certificate ${DOWNLOAD_URL} \
+ && sh ${OVFTOOL_INSTALLER} -p /usr/local --eulas-agreed --required \
+ && rm -f ${OVFTOOL_INSTALLER}*
 
 # ================== Installs Spruce ==============
-RUN wget -v --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v1.0.1/spruce_1.0.1_linux_amd64.tar.gz \
-    && tar -xvf spruce_1.0.1_linux_amd64.tar.gz \
-    && chmod +x /spruce_1.0.1_linux_amd64/spruce \
-    && ln -s /spruce_1.0.1_linux_amd64/spruce /usr/bin/.
+RUN wget -v -O /usr/local/bin/spruce --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v${SPRUCE_VERSION}/spruce-linux-amd64 \
+ && chmod +x /usr/local/bin/spruce
 
 # ================== Installs JQ ==============
-RUN wget -v -O /usr/local/bin/jq --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
-RUN chmod +x /usr/local/bin/jq
+RUN wget -q -O /usr/local/bin/jq --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 \
+ && chmod +x /usr/local/bin/jq
+
+#============ Installs Om ============
+RUN wget -q -O /usr/local/bin/om --no-check-certificate https://github.com/pivotal-cf/om/releases/download/${OM_VERSION}/om-linux \
+  && chmod +x /usr/local/bin/om
 
 # ================== Installs ops_manager_cli gem ==============
 COPY pkg/${GEM_NAME}-${GEM_VERSION}.gem /tmp/
-
-RUN gem install /tmp/${GEM_NAME}-${GEM_VERSION}.gem
-
+RUN echo ':ssl_verify_mode: 0' > ~/.gemrc \
+ && gem install /tmp/${GEM_NAME}-${GEM_VERSION}.gem

data/Rakefile

@@ -4,7 +4,9 @@ require 'github_changelog_generator/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-GitHubChangelogGenerator::RakeTask.new(:changelog)
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.max_issues = 5
+end
 
 task :default => :spec
 task :release => :changelog

data/lib/ops_manager/api/base.rb

@@ -153,7 +153,7 @@ class OpsManager
         Net::HTTP.new(uri.host, uri.port).tap do |http|
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.read_timeout = 1200
+          http.read_timeout = 1800
 
           ctx = OpenSSL::SSL::SSLContext.new
           ctx.ssl_version = :TLSv1_2

data/lib/ops_manager/api/opsman.rb

@@ -47,7 +47,7 @@ class OpsManager
 
       def get_installation_assets
         opts = { write_to: "installation_assets.zip" }
-        say_green '====> Download installation assets ...'
+        print_green '====> Download installation assets ...'
         res = authenticated_get("/api/v0/installation_asset_collection", opts)
         say_green 'done'
         res
@@ -107,12 +107,16 @@ class OpsManager
       end
 
       def upload_product(filepath)
-        file = "#{filepath}"
-        cmd = "curl -s -k \"https://#{target}/api/v0/available_products\" -F 'product[file]=@#{file}' -X POST -H 'Authorization: Bearer #{access_token}'"
-        logger.info "running cmd: #{cmd}"
-        body = `#{cmd}`
-        logger.info "Upload product response: #{body}"
-        raise OpsManager::ProductUploadError if body.include? "error"
+        return unless filepath
+        tar = UploadIO.new(filepath, 'multipart/form-data')
+        print_green "====> Uploading product: #{filepath} ..."
+      #print "====> Uploading product ...".green
+        opts = { "product[file]" => tar }
+        res = authenticated_multipart_post("/api/v0/available_products" , opts)
+
+        raise OpsManager::ProductUploadError.new(res.body) unless res.code == '200'
+        say_green 'done'
+        res
       end
 
       def get_available_products
@@ -121,17 +125,22 @@ class OpsManager
 
       def get_diagnostic_report
         authenticated_get("/api/v0/diagnostic_report")
-      rescue Errno::ETIMEDOUT , Errno::EHOSTUNREACH, Net::HTTPFatalError, Net::OpenTimeout, HTTPClient::ConnectTimeoutError
+      rescue Errno::ETIMEDOUT , Errno::EHOSTUNREACH, Net::HTTPFatalError, Net::OpenTimeout, HTTPClient::ConnectTimeoutError, CF::UAA::HTTPException
         nil
       end
 
-      def import_stemcell(filepath)
+      def import_stemcell(filepath, products = "all")
         return unless filepath
         tar = UploadIO.new(filepath, 'multipart/form-data')
         print_green "====> Uploading stemcell: #{filepath} ..."
+
         opts = { "stemcell[file]" => tar }
-        res = nil
+        # if we specify specific products, don't update stemcell associations everywhere
+        if products != "all"
+          opts["stemcell[floating]"] = false
+       end
 
+        res = nil
         3.times do
           res = authenticated_multipart_post("/api/v0/stemcells", opts)
           case res.code
@@ -139,8 +148,8 @@ class OpsManager
             when '503' ; sleep(60)
           end
         end
-
         raise OpsManager::StemcellUploadError.new(res.body) unless res.code == '200'
+
         say_green 'done'
         res
       end

data/lib/ops_manager/appliance/aws.rb

@@ -6,8 +6,6 @@ class OpsManager
     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',
@@ -16,7 +14,7 @@ class OpsManager
           key_name: config[:opts][:ssh_keypair_name],
           flavor_id: config[:opts][:instance_type],
           subnet_id: config[:opts][:subnet_id],
-          image_id: image_id,
+          image_id: config[:opts][:image_id],
           private_ip_address: config[:ip],
           security_group_ids: security_group_ids,
           availability_zone: config[:opts][:availability_zone],
@@ -40,7 +38,7 @@ class OpsManager
         # 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" }
+        image.wait_for(timeout=36000) { image.state == "available" }
         if image.state != "available"
           fail "Error creating backup AMI, bailing out before destroying the VM"
         end
@@ -73,8 +71,6 @@ class OpsManager
           @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({

data/lib/ops_manager/appliance/base.rb

@@ -16,7 +16,8 @@ class OpsManager
 
       private
       def vm_name
-        @vm_name ||= "#{config[:name]}-#{config[:desired_version]}"
+        desired_version = OpsManager::Semver.new(config[:desired_version])
+        @vm_name ||= "#{config[:name]}-#{desired_version}"
       end
     end
   end

data/lib/ops_manager/appliance/vsphere.rb

@@ -12,13 +12,21 @@ class OpsManager
 
       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}`
+        if ! $?.success?
+          puts 'FAILED. Your old ops manager is offline, and a new one was not provisioned.'.red
+          puts 'You may want to re-run with DEBUG=true set to figure out what failed...'
+          raise "Failure in ovftool"
+        end
         puts 'done'.green
       end
 
+      def cmd
+        vcenter_target= "vi://#{vcenter_username}:#{vcenter_password}@#{config[:opts][:vcenter][:host]}/#{config[:opts][:vcenter][:datacenter]}/host/#{config[:opts][:vcenter][:cluster]}"
+        "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}"
+      end
+
       def stop_current_vm(name)
         print "====> Stopping vm #{name} ...".green
         dc = vim.serviceInstance.find_datacenter(config[:opts][:vcenter][:datacenter])

data/lib/ops_manager/appliance_deployment.rb

@@ -38,7 +38,13 @@ class OpsManager::ApplianceDeployment
     when current_version == desired_version then
       if pending_changes?
         puts "OpsManager at #{config[:ip]} version has pending changes. Applying changes...".green
-        OpsManager::InstallationRunner.trigger!.wait_for_result
+        products = "all"
+        if config[:selected_deployments]
+          products = config[:selected_deployments]
+        elsif config[:single_tile_deploy]
+          products = "none"
+        end
+        OpsManager::InstallationRunner.trigger!(products).wait_for_result
       else
         puts "OpsManager at #{config[:ip]} version is already #{config[:desired_version]}. Skiping ...".green
       end
@@ -75,13 +81,26 @@ class OpsManager::ApplianceDeployment
     upload_installation_assets
     wait_for_uaa
     provision_stemcells
-    OpsManager::InstallationRunner.trigger!.wait_for_result
+    products = "all"
+    if config[:selected_deployments]
+      products = config[:selected_deployments]
+    elsif config[:single_tile_deploy]
+      products = "none"
+    end
+    OpsManager::InstallationRunner.trigger!(products).wait_for_result
   end
 
   def list_current_stemcells
     JSON.parse(installation_settings).fetch('products').inject([]) do |a, p|
-      a << p['stemcell'].fetch('version')
-    end
+      product_name = "stemcells"
+      if p['stemcell'].fetch('os') =~ /windows/i
+        product_name = "stemcells-windows-server"
+      end
+      if p['stemcell'].fetch('os') =~ /ubuntu-xenial/i
+        product_name = "stemcells-ubuntu-xenial"
+      end
+      a << { version: p['stemcell'].fetch('version'), product: product_name }
+    end.uniq
   end
 
   # Finds available stemcell's pivotal network release.
@@ -89,9 +108,9 @@ class OpsManager::ApplianceDeployment
   # #
   # @param version [String] the version number, eg: '2362.17'
   # @return release_id [Integer] the pivotal netowkr release id of the found stemcell.
-  def find_stemcell_release(version)
+  def find_stemcell_release(version, product_name)
     version  = OpsManager::Semver.new(version)
-    releases = stemcell_releases.collect do |r|
+    releases = stemcell_releases(product_name).collect do |r|
       {
         release_id:  r['id'],
         version:     OpsManager::Semver.new(r['version']),
@@ -109,8 +128,8 @@ class OpsManager::ApplianceDeployment
   # @param release_id [String] the version number, eg: '2362.17'
   # @param filename [Regex] the version number, eg: /vsphere/
   # @return id and name [Array] the pivotal network file ID and Filename for the matching stemcell.
-  def find_stemcell_file(release_id, filename)
-    files = JSON.parse(get_product_release_files('stemcells', release_id).body).fetch('product_files')
+  def find_stemcell_file(release_id, filename, product_name)
+    files = JSON.parse(get_product_release_files(product_name, release_id).body).fetch('product_files')
     file = files.select{ |r| r.fetch('aws_object_key') =~ filename }.first
     return file['id'], file['aws_object_key'].split('/')[-1]
   end
@@ -118,18 +137,21 @@ class OpsManager::ApplianceDeployment
   # Lists all the available stemcells in the current installation_settings.
   # Downloads those stemcells.
   def download_current_stemcells
-    puts "Downloading existing stemcells ...".green
+    print "====> Downloading existing stemcells ...".green
+    puts "no stemcells found".green if list_current_stemcells.empty?
     FileUtils.mkdir_p current_stemcell_dir
-    list_current_stemcells.each do |stemcell_version|
-      release_id = find_stemcell_release(stemcell_version)
-      accept_product_release_eula('stemcells', release_id )
+    list_current_stemcells.each do |stemcell_info|
+      stemcell_version = stemcell_info[:version]
+      product_name = stemcell_info[:product]
+      release_id = find_stemcell_release(stemcell_version, product_name)
+      accept_product_release_eula(product_name, release_id)
       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}")
+      file_id, file_name = find_stemcell_file(release_id, stemcell_regex, product_name)
+      download_product_release_file(product_name, release_id, file_id, write_to: "#{current_stemcell_dir}/#{file_name}")
     end
   end
 
@@ -211,12 +233,8 @@ class OpsManager::ApplianceDeployment
     @installation_settings ||= get_installation_settings.body
   end
 
-  def get_stemcell_releases
-    get_product_releases('stemcells')
-  end
-
-  def stemcell_releases
-    @stemcell_releases ||= JSON.parse(get_stemcell_releases.body).fetch('releases')
+  def stemcell_releases(product_name)
+    JSON.parse(get_product_releases(product_name).body).fetch('releases')
   end
 
   def current_stemcell_dir

data/lib/ops_manager/config/base.rb

@@ -16,6 +16,7 @@ class OpsManager
       def expand_path_for!(*attrs)
         attrs.each do |attr|
           path = self[attr] 
+          next if path.nil?
           self[attr] = if path =~ %r{^file://}
             path = Dir.glob(path.gsub!('file://','')).first
             "file://#{path}"

data/lib/ops_manager/config/product_deployment.rb

@@ -6,7 +6,7 @@ class OpsManager
       def initialize(config)
         super(config)
         validate_presence_of! :name, :desired_version 
-        expand_path_for! :stemcell
+        expand_path_for! :stemcell, :filepath
       end
     end
   end

data/lib/ops_manager/director_template_generator.rb

@@ -7,10 +7,11 @@ class OpsManager
       installation_settings.delete(property_name)
     end
 
-    %w{ director_ssl uaa_ssl uaa_credentials uaa_admin_user_credentials
-      uaa_admin_client_credentials }.each do |property_name|
-      product_template["products"][1].delete(property_name)
+    %w{ uaa_credentials uaa_admin_user_credentials uaa_admin_client_credentials }.each do |property_name|
+      product_template["products"].select {|p| p["identifier"] == "p-bosh"}.first.delete(property_name)
     end
+    
+      installation_settings['infrastructure'].delete("vm_extensions")
 
       add_merging_strategy_for_networks
 

data/lib/ops_manager/installation_runner.rb

@@ -5,14 +5,14 @@ class OpsManager
       :get_staged_products, :get_staged_products_errands
     attr_reader :id
 
-    def trigger!
-      res = trigger_installation( :headers => {"Content-Type"=>"application/json"}, :body => body )
+    def trigger!(products = "all")
+      res = trigger_installation( :headers => {"Content-Type"=>"application/json"}, :body => body(products))
       @id = JSON.parse(res.body).fetch('install').fetch('id').to_i
       self
     end
 
-    def self.trigger!
-      new.trigger!
+    def self.trigger!(products = "all")
+      new.trigger!(products)
     end
 
     def wait_for_result
@@ -24,16 +24,28 @@ class OpsManager
     end
 
     private
-    def body
-      @body ||= {'errands' => errands, 'ignore_warnings' => true }.to_json
+    def body(products)
+      b = {'errands' => errands(products), 'ignore_warnings' => true }
+      if products != "all"
+        b["deploy_products"] = products
+      end
+      @body ||= b.to_json
     end
     def opsman_api
       @opsman_api ||= OpsManager::Api::Opsman.new
     end
 
-    def errands
+    def errands(products)
       res = { }
-      staged_products_guids.each do |product_guid|
+
+      if products == "none"
+        return res
+      end
+
+      if products == "all"
+        products = staged_products_guids
+      end
+      products.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

data/lib/ops_manager/logging.rb

@@ -7,13 +7,11 @@ class OpsManager
     end
 
     def self.logger
-      @logger ||= Logger.new(STDOUT).tap do |l|
-        l.level = log_level
-      end
+      @logger ||= Logger.new(STDERR, level: log_level)
     end
 
-    def self.logger=(logger)
-      @logger = logger
+    def self.logger=(l)
+      @logger = l
     end
 
     private

data/lib/ops_manager/product_deployment.rb

@@ -26,7 +26,14 @@ class OpsManager
 
     def run
       OpsManager.target_and_login(config[:target], config[:username], config[:password])
-      import_stemcell(config[:stemcell])
+      products = "all"
+      if config[:selected_deployments]
+        products = config[:selected_deployments]
+      elsif config[:single_tile_deploy]
+        products = [installation.guid]
+      end
+
+      import_stemcell(config[:stemcell], products)
 
       case
       when installation.nil? || forced_deployment?
@@ -43,12 +50,10 @@ class OpsManager
     end
 
     def upload
-      print "====> Uploading product ...".green
       if ProductDeployment.exists?(config[:name], config[:desired_version])
-        puts "product already exists".green
+        puts "====> Product already exists... skipping upload".green
       elsif config[:filepath]
         upload_product(config[:filepath])
-        puts "done".green
       else
         puts "no filepath provided, skipping product upload.".green
       end
@@ -63,7 +68,14 @@ class OpsManager
       upload
       upgrade_product_installation(installation.guid, config[:desired_version])
       merge_product_installation_settings
-      OpsManager::InstallationRunner.trigger!.wait_for_result
+
+      products = "all"
+      if config[:selected_deployments]
+        products = config[:selected_deployments]
+      elsif config[:single_tile_deploy]
+        products = [installation.guid]
+      end
+      OpsManager::InstallationRunner.trigger!(products).wait_for_result
 
       puts "====> Finish!".green
     end
@@ -79,7 +91,13 @@ class OpsManager
       upload
       add_to_installation
       merge_product_installation_settings
-      OpsManager::InstallationRunner.trigger!.wait_for_result
+      products = "all"
+      if config[:selected_deployments]
+        products = config[:selected_deployments]
+      elsif config[:single_tile_deploy]
+        products = [installation.guid]
+      end
+      OpsManager::InstallationRunner.trigger!(products).wait_for_result
 
       puts "====> Finish!".green
     end
@@ -87,7 +105,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 DEFAULT_ARRAY_MERGE_KEY=identifier spruce merge /tmp/is.yml #{config[:installation_settings_file]} > /tmp/new_is.yml`
       upload_installation_settings('/tmp/new_is.yml')
     end
 

data/lib/ops_manager/product_template_generator.rb

@@ -15,41 +15,42 @@ class OpsManager
         delete_from_product(property_name)
       end
 
-      %w{ partitions vm_credentials guid }.each do |property_name|
+      %w{ partitions additional_vm_extensions vm_credentials guid }.each do |property_name|
       delete_from_jobs(property_name)
       end
 
-      %w{ password secret salt private_key_pem }.each do |property_name|
+      %w{ password secret salt private_key_pem cert_pem }.each do |property_name|
         delete_value_from_job_properties(property_name)
       end
 
-      %w{ secret private_key_pem }.each do |property_name|
+      %w{ secret private_key_pem cert_pem }.each do |property_name|
         delete_value_from_product_properties(property_name)
       end
 
-      add_merging_strategy_for_jobs
-      add_merging_strategy_for_job_properties
+      %w{ deployed }.each do |property_name|
+        delete_key_from_product_properties(property_name)
+      end
 
-      { 'products' => [ "(( merge on identifier ))" , selected_product ] }
-    end
+      %w{ deployed }.each do |property_name|
+        delete_key_from_job_properties(property_name)
+      end
 
-    def generate_yml
-      generate.to_yaml
-        .gsub('"(( merge on identifier ))"', '(( merge on identifier ))')
-    end
+      %w{ deployed }.each do |property_name|
+        delete_key_from_product_properties_options_properties(property_name)
+      end
 
-    private
+      %w{ deployed }.each do |property_name|
+        delete_key_from_job_properties_records_properties(property_name)
+      end
 
-    def add_merging_strategy_for_jobs
-      selected_product['jobs'].unshift("(( merge on identifier ))")
+      { 'products' => [ selected_product ] }
     end
 
-    def add_merging_strategy_for_job_properties
-      selected_product['jobs'].each do |j|
-        j['properties'].unshift("(( merge on identifier ))") if j['properties']
-      end
+    def generate_yml
+      generate.to_yaml
     end
 
+    private
     def delete_from_product(name)
       selected_product.delete(name)
     end
@@ -81,6 +82,42 @@ class OpsManager
       end
     end
 
+    def delete_key_from_job_properties(name)
+      selected_product['jobs'].each do |j|
+        j.fetch('properties', []).each  do |p|
+          p.delete(name) 
+        end
+      end
+    end
+
+    def delete_key_from_product_properties(name)
+      selected_product.fetch('properties', []).each  do |p|
+        p.delete(name) 
+      end
+    end
+
+    def delete_key_from_product_properties_options_properties(name)
+      selected_product.fetch('properties',[]).each do |p|
+        p.fetch('options',[]).each do |o|
+          o.fetch('properties', []).each  do |op|
+            op.delete(name) 
+          end
+        end
+      end
+    end
+
+    def delete_key_from_job_properties_records_properties(name)
+      selected_product['jobs'].each do |j|
+        j.fetch('properties',[]).each do |p|
+          p.fetch('records',[]).each do |o|
+            o.fetch('properties', []).each  do |op|
+              op.delete(name) 
+            end
+          end
+        end
+      end
+    end
+
     def delete_value_from_job_properties(name)
       selected_product['jobs'].each do |j|
         j.fetch('properties', []).each  do |p|
@@ -89,5 +126,15 @@ class OpsManager
         end
       end
     end
+
+    def delete_certs_from_template
+      selected_product['jobs'].each do |j|
+        j.fetch('properties',[]).each do |p|
+          
+        end
+      end
+
+    end
+
   end
 end

data/lib/ops_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.14
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,6 +252,7 @@ files:
 - lib/ops_manager/semver.rb
 - lib/ops_manager/version.rb
 - ops_manager.gemspec
+- specs.4.8
 homepage: 
 licenses:
 - MIT
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Performs Ops Manager deployments.