1888N/AEnhance the zone provider to configure zones using a zonecfg export file format.
1888N/AEnhance the output of puppet resource zone, and fix zone clone functionality.
1888N/A- desc "Provider for Solaris Zones."
1888N/A+ desc "Provider for Solaris zones."
1888N/A defaultfor :osfamily => :solaris
1888N/A # Convert the output of a list into a hash
1888N/A- fields = [:id, :name, :ensure, :path, :uuid, :brand, :iptype]
1888N/A+ fields = [:id, :name, :ensure, :zonepath, :uuid, :brand, :iptype ]
1888N/A # Configured but not installed zones do not have IDs
1888N/A del_id << :id if properties[:id] == "-"
1888N/A properties[:ensure] = properties[:ensure].intern
1888N/A- properties[:iptype] = 'exclusive' if properties[:iptype] == 'excl'
3160N/A adm(:list, "-cp").split("\n").collect do |line|
1888N/A- def multi_conf(name, should, &action)
1888N/A- has = [] if has == :absent
1888N/A+ # Read in the zone configuration parameters and properties and
1888N/A+ # perform the zone configuration. Options are cloning the zone,
1888N/A+ # which needs a zonecfg_export file, configuring an archive, which
1888N/A+ # takes optional zonecfg_export and archived_zonename parameters,
1888N/A+ # or performing a zone configuration, which requires a zonecfg_export
1888N/A+ if @resource[:archive].nil? && @resource[:zonecfg_export].nil?
1888N/A+ raise Puppet::Error, "No configuration resource is defined."
1888N/A- def_prop :iptype, "set ip-type=%s"
1888N/A- def_prop :autoboot, "set autoboot=%s"
1888N/A- def_prop :path, "set zonepath=%s"
1888N/A- def_prop :pool, "set pool=%s"
1888N/A- def_prop :shares, "add rctl\nset name=
zone.cpu-shares\nadd value (priv=privileged,limit=%s,action=none)\nend"
1888N/A- def_multiprop :ip do |action, str|
1888N/A- cmd << "set physical=#{interface}" if interface
1888N/A- cmd << "set address=#{ip}" if ip
1888N/A- cmd << "set defrouter=#{defrouter}" if defrouter
1888N/A- "remove net address=#{ip}"
1888N/A- "remove net physical=#{interface}"
1888N/A- raise ArgumentError, "can not remove network based on default router"
1888N/A+ if !@resource[:zonecfg_export]
1888N/A+ raise Puppet::Error, "A zone configuration must be defined to
1888N/A+ command = "#{command(:cfg)} -z #{@resource[:name]} -f #{@resource[:zonecfg_export]}"
1888N/A+ unless @resource[:zonecfg_export].nil? || @resource[:zonecfg_export].empty?
1888N/A+ str = @resource[:zonecfg_export].gsub(/[\n]\n*\s*/, "; ")
1888N/A- def_multiprop :dataset do |action, str|
1888N/A- when :add; ['add dataset',"set name=#{str}",'end'].join("\n")
1888N/A- when :rm; "remove dataset name=#{str}"
1888N/A+ unless @resource[:archive].nil? || @resource[:archive].empty?
1888N/A+ command = "#{command(:cfg)} -z #{@resource[:name]} \'create -a #{@resource[:archive]};#{str}\'"
1888N/A+ command = "#{command(:cfg)} -z #{@resource[:name]} create -a #{@resource[:archive]} "
1888N/A+ if @resource[:archived_zonename]
1888N/A+ command << " -z #{@resource[:archived_zonename]}"
1888N/A- def_multiprop :inherit do |action, str|
1888N/A- when :add; ['add inherit-pkg-dir', "set dir=#{str}",'end'].join("\n")
1888N/A- when :rm; "remove inherit-pkg-dir dir=#{str}"
1888N/A+ if !@resource[:zonecfg_export].nil? && @resource[:archive].nil?
1888N/A+ command = "#{command(:cfg)} -z #{@resource[:name]} \'#{str}\'"
1888N/A- [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :inherit]
1888N/A- # Perform all of our configuration steps.
1888N/A- arr = ["create -b #{@resource[:create_args]}"]
1888N/A- # Then perform all of our configuration steps. It's annoying
1888N/A- # that we need this much internal info on the resource.
1888N/A+ r = exec_cmd(:cmd => command)
1888N/A properties[:ensure] != :absent
1888N/A # We cannot use the execpipe in util because the pipe is not opened in
1888N/A- # In bash, the exit value of the last command is the exit value of the
1888N/A- out = execute("echo \"#{var[:input]}\" | #{var[:cmd]}", :failonfail => false, :combine => true)
1888N/A- {:out => out, :exit => st}
1888N/A- # Clear out the cached values.
1888N/A- str = (@cmds << "commit" << "exit").join("\n")
1888N/A- command = "#{command(:cfg)} -z #{@resource[:name]} -f -"
1888N/A- r = exec_cmd(:cmd => command, :input => str)
1888N/A- if r[:exit] != 0 or r[:out] =~ /not allowed/
1888N/A- raise ArgumentError, "Failed to apply configuration"
1888N/A+ execute("echo \"#{var[:input]}\" | #{var[:cmd]}", :failonfail => true, :combine => true)
1888N/A+ execute("#{var[:cmd]}", :failonfail => true, :combine => true)
1888N/A def install(dummy_argument=:work_arround_for_ruby_GC_bug)
1888N/A+ if !@resource[:install_args] and @resource[:config_profile]
1888N/A+ @resource[:install_args] = " -c " + @resource[:config_profile]
1888N/A+ elsif !@resource[:install_args] and @resource[:archive]
1888N/A+ @resource[:install_args] = " -a " + @resource[:archive]
1888N/A+ if @resource[:archived_zonename]
1888N/A+ @resource[:install_args] << " -z " + @resource[:archived_zonename]
1888N/A+ elsif @resource[:config_profile]
1888N/A+ @resource[:install_args] << " -c " + @resource[:config_profile]
1888N/A if @resource[:clone] # TODO: add support for "-s snapshot"
1888N/A- zoneadm :clone, @resource[:clone]
1888N/A- elsif @resource[:install_args]
1888N/A+ zoneadm :clone, @resource[:clone]
1888N/A+ elsif @resource[:install_args]
1888N/A zoneadm :install, @resource[:install_args].split(" ")
1888N/A # We need a way to test whether a zone is in process. Our 'ensure'
1888N/A # property models the static states, but we need to handle the temporary ones.
1888N/A ["incomplete", "ready", "shutting_down"].include? hash[:ensure]
1888N/A- # Execute a configuration string. Can't be private because it's called
1888N/A if cfg = @resource[:sysidcfg]
1888N/A- # Now add in the configuration information
1888N/A+ # Unconfigure and delete the zone
1888N/A- # Turn the results of getconfig into status information.
1888N/A- result[:autoboot] = config[:autoboot] ? config[:autoboot].intern : :true
1888N/A- result[:pool] = config[:pool]
1888N/A- result[:shares] = config[:shares]
1888N/A- if dir = config["inherit-pkg-dir"]
1888N/A- if datasets = config["dataset"]
1888N/A- result[:iptype] = config[:'ip-type'] if config[:'ip-type']
1888N/A- "#{params[:physical]}:#{params[:address]}:#{params[:defrouter]}"
1888N/A- "#{params[:physical]}:#{params[:address]}"
1888N/A+ # Execute the zoneadm command with the arguments
1888N/A adm("-z", @resource[:name], *cmd)
1888N/A rescue Puppet::ExecutionFailure => detail