Merge pull request #510 from yast/casp_services

Casp services
yast · Feb 1, 2017 · 4cca1ad · 4cca1ad
2 parents 7c7d6a2 + 1b22b2e
commit 4cca1ad
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb  1 14:20:43 UTC 2017 - jreidinger@suse.com
+
+- Enable CaaSP specific services on the installed system
+  (FATE#321738)
+- 3.1.217.18
+
 -------------------------------------------------------------------
 Tue Jan 31 16:06:40 UTC 2017 - jreidinger@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.217.17
+Version:        3.1.217.18
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/clients/inst_casp_overview.rb b/src/lib/installation/clients/inst_casp_overview.rb
@@ -27,6 +27,7 @@
 
 require "installation/widgets/overview"
 require "installation/widgets/system_role"
+require "installation/services"
 
 module Installation
   # This library provides a simple dialog for setting
@@ -92,13 +93,25 @@ def run
         end
       end
 
+      add_casp_services
+
       Yast::Wizard.CloseDialog if separate_wizard_needed?
 
       ret
     end
 
   private
 
+    # Specific services that needs to be enabled on CAaSP see (FATE#321738)
+    # It is additional services to the ones defined for role.
+    # It is caasp only services and for generic approach systemd-presets should be used.
+    # In this case it is not used, due to some problems with cloud services.
+    CASP_SERVICES = ["sshd", "cloud-init-local", "cloud-init", "cloud-config",
+                     "cloud-final", "issue-generator", "issue-add-ssh-keys"].freeze
+    def add_casp_services
+      ::Installation::Services.enabled.concat(CASP_SERVICES)
+    end
+
     def quadrant_layout(upper_left:, lower_left:, upper_right:, lower_right:)
       HBox(
         HWeight(

diff --git a/test/inst_casp_overview_test.rb b/test/inst_casp_overview_test.rb
@@ -108,5 +108,11 @@ def label
 
       subject.run
     end
+
+    it "adds caasp specific services to be enabled" do
+      subject.run
+
+      expect(::Installation::Services.enabled).to include("cloud-init")
+    end
   end
 end