diff options
Diffstat (limited to 'lib/puppet/provider/zone/solaris.rb')
| -rw-r--r-- | lib/puppet/provider/zone/solaris.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb index b047f6984..1aaa70d47 100644 --- a/lib/puppet/provider/zone/solaris.rb +++ b/lib/puppet/provider/zone/solaris.rb @@ -65,7 +65,9 @@ Puppet::Type.type(:zone).provide(:solaris) do end def install(dummy_argument=:work_arround_for_ruby_GC_bug) - if @resource[:install_args] + if @resource[:clone] # TODO: add support for "-s snapshot" + zoneadm :clone, @resource[:clone] + elsif @resource[:install_args] zoneadm :install, @resource[:install_args].split(" ") else zoneadm :install @@ -227,8 +229,17 @@ Puppet::Type.type(:zone).provide(:solaris) do if dir = config["inherit-pkg-dir"] result[:inherit] = dir.collect { |dirs| dirs[:dir] } end + result[:iptype] = config[:"ip-type"] if net = config["net"] - result[:ip] = net.collect { |params| "%s:%s" % [params[:physical], params[:address]] } + result[:ip] = net.collect do |params| + if params[:defrouter] + "%s:%s:%s" % [params[:physical], params[:address], params[:defrouter]] + elsif params[:address] + "%s:%s" % [params[:physical], params[:address]] + else + params[:physical] + end + end end result |