ops_manager_cli 0.7.11 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc90c0ebcf8eec0f36dabad16951c34aaa7cf2a
-  data.tar.gz: 5c7c94650a628f317e8138c2eae5c3d749d371d2
+  metadata.gz: ee5a9bff7eaf8b7173c9e4e4b5d2bfa95cad310e
+  data.tar.gz: 9f167f4715184828677892aabbfcf6f2bf0c2bce
 SHA512:
-  metadata.gz: cf5d1e7b4a78aecb272ca47821a286ca3f2a8a219f915e22e6b21e0c5031a18ab08416ed751a3b59a618c7e359b1a3b4be6ecab373f31527e5c170f4252f9409
-  data.tar.gz: 4ac9422ac493e4725ccd8cc252e59ce79d9e811ff1e59c18e392fd6ca49ff6b9300eb2143f4768e58db4384abf9113c05e673630f05fde3cb3b76c189b70be85
+  metadata.gz: e435c487df21a31cd91e5b2eb1f96faa8e55b11470f4b156d821de0829ef45e084c117ba009e9aa69be64e29c05014b63a18643ea21b3040c5200837d0af6d93
+  data.tar.gz: 295e443dd6b68eb53ef2f882cc8169e4dc8cc6d7deafe59c90b72ce31674d6875d01c593914c957f287044d3a7056039ee0bfd9ca8331d100ebbcde6dca492c0

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # 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)
 

data/Dockerfile

@@ -1,9 +1,10 @@
 FROM ruby:2.4.1
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.7.11
-ENV SPRUCE_VERSION 1.17.0
+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
@@ -20,13 +21,17 @@ RUN wget -q --no-check-certificate ${DOWNLOAD_URL} \
  && rm -f ${OVFTOOL_INSTALLER}*
 
 # ================== Installs Spruce ==============
-RUN wget -q -O /usr/local/bin/spruce --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v${SPRUCE_VERSION}/spruce-linux-amd64 \
+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 -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 echo ':ssl_verify_mode: 0' > ~/.gemrc \

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],

data/lib/ops_manager/appliance_deployment.rb

@@ -38,11 +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
-        if config[:single_tile_deploy]
-          OpsManager::InstallationRunner.trigger!("none").wait_for_result
-        else
-          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
@@ -79,11 +81,13 @@ class OpsManager::ApplianceDeployment
     upload_installation_assets
     wait_for_uaa
     provision_stemcells
-    if config[:single_tile_deploy]
-      OpsManager::InstallationRunner.trigger!("none").wait_for_result
-    else
-      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
@@ -92,6 +96,9 @@ class OpsManager::ApplianceDeployment
       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

data/lib/ops_manager/product_deployment.rb

@@ -26,12 +26,15 @@ class OpsManager
 
     def run
       OpsManager.target_and_login(config[:target], config[:username], config[:password])
-      if config[:single_tile_deploy]
-        import_stemcell(config[:stemcell], [installation.guid])
-      else
-        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?
         deploy
@@ -65,11 +68,14 @@ class OpsManager
       upload
       upgrade_product_installation(installation.guid, config[:desired_version])
       merge_product_installation_settings
-      if config[:single_tile_deploy]
-        OpsManager::InstallationRunner.trigger!([installation.guid]).wait_for_result
-      else
-        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
@@ -85,12 +91,13 @@ class OpsManager
       upload
       add_to_installation
       merge_product_installation_settings
-      if config[:single_tile_deploy]
-        OpsManager::InstallationRunner.trigger!([installation.guid]).wait_for_result
-      else
-        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

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.7.11"
+  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.11
+  version: 0.7.14
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler