crowbar-client 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b7ba57caa745cb2c4b7b61f72fb3c4c44a6a9c23b8bf5437f5da433028ae44
-  data.tar.gz: a11888a2f0e8cd2276294e32da87479b542517bfbdd8e595bc76b9e3c687ec7f
+  metadata.gz: c208957102b3e9fc6ad3c18825ae5921bf5e184f8a915e25839d4734560d3402
+  data.tar.gz: 2def6dda277aea448f99989d4b413fa71d284129f2690d0149be8464aff0b428
 SHA512:
-  metadata.gz: 32da261c491ce8d2bfbf5303b36b0869f71d2fef7fb226371efc05fcaadc6e252650ed7eba8e730bc182cd3bb05efea6bc68dd0d15837829581945cabcb4f8d6
-  data.tar.gz: 086f06ec09baa46b080e64bc22f14dcafdc5438872778c9a38d1835b102fd6fccc9d6730b5de8eb498d8d66e9b07dbd79717a24b1b31d2938087df8d0570e801
+  metadata.gz: 82c4fba2797c5126f463c6607758e8b65d9b801f85a70e1e0064a06ac574c2f0bc0dcf7b303a227d7d0382a09fc5ae89a1b77105db232d7674063ca7ab82b5e7
+  data.tar.gz: dbd998fb8d2a2633c76755ec4f648eb2ef088ed4e7bb5eb9d766ff2abbcbb2f34445a20ec7e1de6439f844bee9486807e1efe122ea8c7c52430109a814cda997

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.6.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.6.0) - 2018-06-19
+
+* BUGFIX
+  * Fix node show help (bsc#1024498)
+* ENHANCEMENT
+  * Extend the clean restart flags
+  * Add an option to identify the version of product being upgraded
+  * Added support for postpone/resume upgrade actions
+
 ## [3.5.2](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.2) - 2018-01-09
 
 * BUGFIX

data/lib/crowbar/client/app/services.rb

@@ -35,17 +35,18 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "clear_restart NODE SERVICE",
+        desc "clear_restart NODE [COOKBOOK [SERVICE]]",
              "Clear the restart flag for a service on a node"
 
         long_desc <<-LONGDESC
-          `clear_restart NODE SERVICE` will clear the 'restart needed' flag
-          for the given SERVICE on the NODE.
+          `clear_restart NODE [COOKBOOK [SERVICE]]` will clear the 'restart needed' flag
+          for the given SERVICE, or all services in a COOKBOOK, or all services on the NODE.
         LONGDESC
-        def clear_restart(node, service)
+        def clear_restart(node, cookbook = nil, service = nil)
           Command::Services::ClearServiceRestart.new(
             *command_params(
               node: node,
+              cookbook: cookbook,
               service: service
             )
           ).execute

data/lib/crowbar/client/app/upgrade.rb

@@ -189,8 +189,19 @@ module Crowbar
           catch_errors(e)
         end
 
+        if Config.defaults[:upgrade_versions] == "7-to-8"
+          postpone_resume_short = "|postpone|resume"
+          postpone_resume = <<-RESUME
+            `nodes postpone` will postpone the upgrade of compute nodes.
+            It is possible to use crowbar in this state.
+
+            `nodes resume` will resume the upgrade process.
+            It is possible to go back to upgrading the compute nodes.
+          RESUME
+        end
+
         desc "nodes COMPONENT",
-          "Trigger the node upgrade (all|controllers|NODENAME)"
+          "Trigger the node upgrade (all|controllers|NODENAME#{postpone_resume_short})"
 
         long_desc <<-LONGDESC
           `nodes all` will upgrade all nodes.
@@ -199,6 +210,8 @@ module Crowbar
 
           `nodes NODENAME` will upgrade the node with the NODENAME.
           This only works for compute nodes.
+
+          #{postpone_resume}
         LONGDESC
 
         def nodes(component)

data/lib/crowbar/client/command/node/show.rb

@@ -47,6 +47,8 @@ module Crowbar
 
                 if formatter.empty?
                   err "No result"
+                elsif args.name == "help"
+                  err "Node does not exist"
                 else
                   say formatter.result
                 end

data/lib/crowbar/client/command/upgrade/admin.rb

@@ -36,7 +36,11 @@ module Crowbar
               when 200
                 say "Triggered Crowbar operating system upgrade"
                 say "Wait until the admin server is fully upgraded and rebooted."
-                say "Next step: 'crowbarctl upgrade database [new|connect]'"
+                if Config.defaults[:upgrade_versions] == "6-to-7"
+                  say "Next step: 'crowbarctl upgrade database [new|connect]'"
+                else
+                  say "Next step: 'crowbarctl upgrade repocheck nodes'"
+                end
               else
                 err format_error(
                   request.parsed_response["error"], "admin"

data/lib/crowbar/client/command/upgrade/nodes.rb

@@ -39,6 +39,10 @@ module Crowbar
                   say "Successfully triggered the upgrade of the nodes. "
                 when "controllers"
                   say "Successfully triggered the upgrade of the controller nodes. "
+                when "postpone"
+                  say "The upgrade of compute nodes was postponed."
+                when "resume"
+                  say "The upgrade process was resumed, compute nodes could be upgraded now."
                 else
                   say "Successfully triggered the upgrade of node #{args.component}. "
                 end

data/lib/crowbar/client/config.rb

@@ -60,6 +60,7 @@ module Crowbar
           anonymous: default_anonymous,
           apiversion: default_apiversion,
           experimental: default_experimental,
+          upgrade_versions: default_upgrade_versions,
           debug: default_debug
         )
       end
@@ -93,6 +94,32 @@ module Crowbar
 
       protected
 
+      #
+      # Define a default value for which upgrade is being executed
+      # User could provide values ("6-to-7" or "7-to-8") via ENV variable
+      # or it's gonna be set based on the system state.
+      #
+      # @return [String] the default value for upgrade versions
+      #
+      def default_upgrade_versions
+        return ENV["CROWBAR_UPGRADE_VERSIONS"] if ENV["CROWBAR_UPGRADE_VERSIONS"].present?
+        # if an upgrade is running, we could check the file indication
+        return "6-to-7" if File.exist?("/var/lib/crowbar/upgrade/6-to-7-upgrade-running")
+        return "7-to-8" if File.exist?("/var/lib/crowbar/upgrade/7-to-8-upgrade-running")
+
+        # if upgrade has not been started, check the system version
+        os_release_file = "/etc/os-release"
+
+        if File.exist?(os_release_file)
+          os_release = Hash[
+            File.open(os_release_file).read.scan(/(\S+)\s*=\s*"([^"]+)/)
+          ]
+          return "6-to-7" if os_release["VERSION_ID"] == "12.1"
+        end
+
+        "7-to-8"
+      end
+
       #
       # Define a default alias value
       #

data/lib/crowbar/client/request/services/clear_restart.rb

@@ -43,6 +43,7 @@ module Crowbar
           def content
             super.easy_merge!(
               node: attrs.node,
+              cookbook: attrs.cookbook,
               service: attrs.service
             )
           end

data/lib/crowbar/client/version.rb

@@ -28,12 +28,12 @@ module Crowbar
       #
       # Minor version
       #
-      MINOR = 5
+      MINOR = 6
 
       #
       # Patch version
       #
-      PATCH = 2
+      PATCH = 0
 
       #
       # Optional suffix

data/spec/crowbar/client/request/services/clear_restart_spec.rb

@@ -26,8 +26,8 @@ describe "Crowbar::Client::Request::Services::ClearServiceRestart" do
       )
     end
 
-    let!(:attrs) { { node: "test", service: "test" } }
-    let!(:params) { { node: "test", service: "test" } }
+    let!(:attrs) { { node: "test", cookbook: "test", service: "test" } }
+    let!(:params) { { node: "test", cookbook: "test", service: "test" } }
     let!(:method) { :post }
     let!(:url) { "api/restart_management/restarts" }
     let!(:headers) { { "Accept" => header, "Content-Type" => header } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -621,7 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Crowbar commandline client