merged with SLE-12-SP2-CASP

.travis.yml

@@ -4,8 +4,13 @@ compiler:
 before_install:
     # disable rvm, use system Ruby
     - rvm reset
+    # install newer augeasget repo with newer augeas, otherwise ruby-augeas fails (see https://github.com/yast/yast-network/pull/454#issuecomment-253795507)
+    - sudo add-apt-repository -y ppa:raphink/augeas
+    - sudo apt-get update
+    - sudo apt-get install libaugeas-dev libxml2-dev
+    # end of augeas install
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2-core-dev yast2 yast2-network yast2-transfer yast2-users yast2-country" -g "rspec:3.3.0 yast-rake gettext rubocop:0.41.2 simplecov coveralls cheetah"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2-core-dev yast2 yast2-network yast2-transfer yast2-users yast2-country libaugeas-dev" -g "rspec:3.3.0 yast-rake gettext rubocop:0.41.2 simplecov:0.12.0 coveralls:0.8.19 cheetah abstract_method cfa"
 script:
     - rake check:syntax
     - rake check:pot

doc/control-file.md

@@ -98,7 +98,7 @@ related variables.
 > Note that the control file is not an optional tool to help customize
 > installation, it is required during installation and without the file,
 > installation may fail or lead to unexpected results. Control file on installed
-> system located in `/etc/YaST2/control.xml` is owned by ${PRODUCT}-release
+> system located in `/etc/YaST2/control.xml` is owned by `${PRODUCT}-release`
 > package.
 
 During installation, *linuxrc* searches for a file named
@@ -617,6 +617,10 @@ This is a list of supported entries in *software*:
 -   *clone\_install\_recommended\_default* - Default entry for
     "install_recommended" in created AutoYaST configuration file.
 
+-   *minimalistic_libzypp_config* - adjust the libzypp configuration
+    to reduce the amount of packages to install: only required
+    packages are considered, no documentation and no multiversion.
+
 Additionally, you can configure how updating of packages should be
 performed. The following options are available:
 

package/yast2-installation.changes

@@ -3,6 +3,121 @@ Mon Feb 20 13:28:28 CET 2017 - schubi@suse.de
 
 - Downloading release notes: Do not try again if the host or the
   proxy cannot be resolved (bnc#1022784)
+- 3.1.217.25
+
+-------------------------------------------------------------------  
+Tue Feb 14 13:24:33 CET 2017 - schubi@suse.de
+
+- CaaSP AY: Adapted requirements of yast2-services-manager.
+  (FATE#321738)
+- 3.1.217.24
+
+-------------------------------------------------------------------  
+Mon Feb 13 14:49:14 UTC 2017 - mfilka@suse.com
+
+- bnc#1022546
+  - update all-in-one's subdialog (network/kdump/partitioning/...)
+    overview when the dialog is closed and do not lose another
+    content already entered by user.
+- 3.1.217.23
+
+-------------------------------------------------------------------
+Mon Feb 13 14:12:59 CET 2017 - schubi@suse.de
+
+- Calling services-manager_finish in order to write AutoYaST
+  service settings (if needed).
+  (FATE#321738)
+- 3.1.217.22  
+
+-------------------------------------------------------------------
+Mon Feb 13 13:00:42 UTC 2017 - kanderssen@suse.com
+
+- CaaSP: do not crash when used a dashed url for the controller
+  node location (bsc#1024965)
+- 3.1.217.21
+
+-------------------------------------------------------------------
+Wed Feb  8 16:42:29 UTC 2017 - kanderssen@suse.com
+
+- CaaSP all-in-one-dialog: added validation to the controller node
+  location field, modified label and write it to the minion
+  master.conf file at the end of the installation (FATE#321738)
+- 3.1.217.20
+
+-------------------------------------------------------------------
+Wed Feb  8 11:57:14 UTC 2017 - lslezak@suse.cz
+
+- CaaSP: Display the Beta product warning at start when it is
+  present (bsc#1016887)
+- 3.1.217.19
+
+-------------------------------------------------------------------
+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
+
+- Do not crash if role contain own service to enable (bsc#1022762)
+- 3.1.217.17
+
+-------------------------------------------------------------------
+Fri Jan 27 15:55:33 UTC 2017 - kanderssen@suse.com
+
+- Ask for installation confirmation in all-in-one dialog before
+  proceed with it. (Fate#322328)
+- 3.1.217.16
+
+-------------------------------------------------------------------
+Fri Jan 27 09:11:32 UTC 2017 - jreidinger@suse.com
+
+- Respect newly registered update repos in software proposal and
+  do register. (FATE#322328)
+- 3.1.217.15
+
+-------------------------------------------------------------------
+Thu Jan 26 14:16:43 UTC 2017 - jreidinger@suse.com
+
+- handle proposal errors in all-in-one dialog (FATE#322328)
+- 3.1.217.14
+
+-------------------------------------------------------------------
+Wed Jan 25 15:29:02 UTC 2017 - mvidner@suse.com
+
+- Added an all-in-one installation overview for CaaSP (FATE#322328)
+- 3.1.217.13
+
+-------------------------------------------------------------------
+Fri Jan 20 08:44:28 UTC 2017 - mfilka@suse.com
+
+- bnc#1017752
+  - do not show language change warning in software proposal
+    incorrectly when language was not changed.
+- 3.1.217.12
+
+-------------------------------------------------------------------
+Tue Jan 17 15:34:22 UTC 2017 - igonzalezsosa@suse.com
+
+- Do not retry to download release notes if a previous attempt
+  failed (bsc#1015794)
+- 3.1.217.11
+
+-------------------------------------------------------------------
+Mon Jan 16 12:42:52 UTC 2017 - jreidinger@suse.com
+
+- add ability to roles to enable list of services when selected
+  (FATE#321754)
+- 3.1.217.10
+
+-------------------------------------------------------------------
+Mon Dec 19 13:23:12 UTC 2016 - mfilka@suse.com
+
+- fate#321739
+  - Made user's interaction possible in case of error in read-only
+    proposal.
 - 3.1.217.9
 
 -------------------------------------------------------------------

package/yast2-installation.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.217.9
+Version:        3.1.217.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -72,19 +72,25 @@ Requires:	initviocons
 # Proxy settings for 2nd stage (bnc#764951)
 Requires:       yast2-proxy
 
-# Systemd default target and services
-Requires: yast2-services-manager
+# Systemd default target and services. This version supports
+# writing settings in the first installation stage.
+Requires: yast2-services-manager >= 3.1.43.1
 
 # Network service setup moved into yast2-network
 Requires: yast2-network >= 3.1.143
 
+# Augeas lenses
+Requires:       augeas-lenses
+
 # Only in inst-sys
 # Requires:	yast2-add-on
 # Requires:	yast2-update
 
 # new root password cwm widget
+BuildRequires:	yast2-users >= 3.1.57.4
 Requires:	yast2-users >= 3.1.57.4
 # new keyboard layout cwm widget
+BuildRequires:	yast2-country >= 3.1.33.1
 Requires:	yast2-country >= 3.1.33.1
 
 # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
@@ -103,8 +109,8 @@ Conflicts:	yast2-core < 2.17.10
 # Top bar with logo
 Conflicts:	yast2-ycp-ui-bindings < 3.1.7
 
-# RegserviceSelectionDialog
-Conflicts:  yast2-registration < 3.1.179
+# new registration widget
+Conflicts:  yast2-registration <= 3.1.190
 
 Obsoletes:	yast2-installation-devel-doc
 

src/Makefile.am

@@ -23,6 +23,7 @@ client_DATA = \
   clients/installation.rb \
   clients/installation_settings_finish.rb \
   clients/inst_ask_online_update.rb \
+  clients/inst_casp_overview.rb \
   clients/inst_complex_welcome.rb \
   clients/inst_congratulate.rb \
   clients/inst_deploy_image.rb \
@@ -54,7 +55,6 @@ client_DATA = \
   clients/inst_ssh_import.rb \
   clients/inst_system_analysis.rb \
   clients/inst_system_role.rb \
-  clients/inst_worker_role.rb \
   clients/inst_upgrade_urls.rb \
   clients/inst_update_installer.rb \
   clients/inst_welcome.rb \
@@ -67,8 +67,10 @@ client_DATA = \
   clients/prep_shrink_finish.rb \
   clients/proxy_finish.rb \
   clients/remote_finish.rb \
+  clients/roles_finish.rb \
   clients/save_config_finish.rb \
   clients/save_hw_status_finish.rb \
+  clients/services_finish.rb \
   clients/snapshots_finish.rb \
   clients/ssh_import_proposal.rb \
   clients/ssh_import_auto.rb \
@@ -126,11 +128,13 @@ ylib_DATA = \
   lib/installation/snapshots_finish.rb \
   lib/installation/updates_manager.rb \
   lib/installation/update_repository.rb \
+  lib/installation/services.rb \
   lib/installation/ssh_config.rb \
   lib/installation/ssh_key.rb \
   lib/installation/ssh_config_file.rb \
   lib/installation/ssh_importer_presenter.rb \
-  lib/installation/ssh_importer.rb
+  lib/installation/ssh_importer.rb \
+  lib/installation/system_role.rb
 
 ylibtransferdir = "${yast2dir}/lib/transfer"
 ylibtransfer_DATA = \
@@ -150,6 +154,7 @@ ylibclient_DATA = \
   lib/installation/clients/installation.rb \
   lib/installation/clients/installation_settings_finish.rb \
   lib/installation/clients/inst_ask_online_update.rb \
+  lib/installation/clients/inst_casp_overview.rb \
   lib/installation/clients/inst_complex_welcome.rb \
   lib/installation/clients/inst_congratulate.rb \
   lib/installation/clients/inst_deploy_image.rb \
@@ -188,8 +193,10 @@ ylibclient_DATA = \
   lib/installation/clients/network_finish.rb \
   lib/installation/clients/pre_umount_finish.rb \
   lib/installation/clients/proxy_finish.rb \
+  lib/installation/clients/roles_finish.rb \
   lib/installation/clients/save_config_finish.rb \
   lib/installation/clients/save_hw_status_finish.rb \
+  lib/installation/clients/services_finish.rb \
   lib/installation/clients/ssh_import_proposal.rb \
   lib/installation/clients/ssh_settings_finish.rb \
   lib/installation/clients/stroj-casu.rb \
@@ -204,9 +211,21 @@ ylibclient_DATA = \
 
 ylibdialogdir = "${yast2dir}/lib/installation/dialogs"
 ylibdialog_DATA = \
-  lib/installation/dialogs/ssh_import.rb \
-  lib/installation/dialogs/worker_role.rb
+  lib/installation/dialogs/ssh_import.rb
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylibdialog_DATA) $(ylib_DATA) $(ylibtransfer_DATA)
+ylibwidgetdir = "${yast2dir}/lib/installation/widgets"
+ylibwidget_DATA = \
+  lib/installation/widgets/overview.rb \
+  lib/installation/widgets/system_role.rb
+
+ylibcfadir = "${yast2dir}/lib/installation/cfa"
+ylibcfa_DATA = \
+  lib/installation/cfa/salt.rb
+
+ylibrolehandlerdir = "${yast2dir}/lib/installation/system_roles"
+ylibrolehandler_DATA = \
+  lib/installation/system_roles/handlers.rb
+
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylibdialog_DATA) $(ylib_DATA) $(ylibtransfer_DATA) $(ylibcfa_DATA) $(ylibrolehandler_DATA)
 
 include $(top_srcdir)/Makefile.am.common

src/clients/inst_casp_overview.rb

@@ -0,0 +1,2 @@
+require "installation/clients/inst_casp_overview"
+::Installation::InstCaspOverview.new.run

src/clients/roles_finish.rb

@@ -0,0 +1,3 @@
+require "installation/clients/roles_finish"
+
+::Installation::Clients::RolesFinish.run

src/clients/services_finish.rb

@@ -0,0 +1,3 @@
+require "installation/clients/services_finish"
+
+::Installation::Clients::ServicesFinish.run

src/lib/installation/cfa/salt.rb

@@ -0,0 +1,28 @@
+require "cfa/base_model"
+require "cfa/augeas_parser"
+require "cfa/matcher"
+
+module Installation
+  module CFA
+    # Represents a Salt Minion master configuration file.
+    class MinionMasterConf < ::CFA::BaseModel
+      attributes(master: "master")
+
+      # Configuration parser
+      #
+      # FIXME: At this time, we're using Augeas' cobblersettings lense because,
+      # although the file is in yaml format, it doesn't have a YAML header
+      # which is required by the yaml lense.
+      PARSER = ::CFA::AugeasParser.new("cobblersettings.lns")
+      # Path to configuration file
+      PATH = "/etc/salt/minion.d/master.conf".freeze
+
+      # Constructor
+      #
+      # @param file_handler [.read, .write, nil] an object able to read/write a string.
+      def initialize(file_handler: nil)
+        super(PARSER, PATH, file_handler: file_handler)
+      end
+    end
+  end
+end