Postpone CM provisioning

yast · Dec 14, 2018 · ba04e53 · ba04e53
1 parent 2eeaca3
commit ba04e53
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/clients/firstboot.rb b/src/clients/firstboot.rb
@@ -67,6 +67,8 @@ def main
       @ret = ProductControl.Run
       Builtins.y2milestone("ProductControl::Run() returned: %1", @ret)
 
+      WFM.CallFunction("configuration_management_finish", [])
+
       Pkg.SourceFinishAll
       Pkg.TargetFinish
 

diff --git a/src/lib/y2firstboot/clients/configuration_management.rb b/src/lib/y2firstboot/clients/configuration_management.rb
@@ -33,7 +33,6 @@ class ConfigurationManagement
       def run
         configurator = Yast::ConfigurationManagement::Configurators::Base.for(config)
         configurator.prepare
-        Yast::ConfigurationManagement::Clients::Provision.new.run
       end
 
     private

diff --git a/test/y2firstboot/clients/firstboot_test.rb b/test/y2firstboot/clients/firstboot_test.rb
@@ -46,11 +46,6 @@
         .and_return(configurator)
     end
 
-    it "runs the provisioner" do
-      expect(provisioner).to receive(:run)
-      client.run
-    end
-
     it "uses the configuration from the control file" do
       expect(Yast::ConfigurationManagement::Configurators::Base).to receive(:for) do |config|
         expect(config.states_roots).to include(Pathname.new("/srv/salt"))