one_vmm_ec2.rb.patch

Tuomo Varis, 04/19/2011 07:43 AM

Download (1.02 KB)

View differences:

one_vmm_ec2.rb 2011-04-19 09:38:29.000000000 +0200
91 91
            @defaults["KEYPAIR"]         = ec2_value(ec2,"KEYPAIR")
92 92
            @defaults["AUTHORIZEDPORTS"] = ec2_value(ec2,"AUTHORIZEDPORTS")
93 93
            @defaults["INSTANCETYPE"]    = ec2_value(ec2,"INSTANCETYPE")
94
	    @defaults["AVAILABILITYZONE"] = ec2_value(ec2,"AVAILABILITYZONE")
94 95
        end
95 96
    end
96 97

  
......
142 143
        eip     = ec2_value(ec2,"ELASTICIP")
143 144
        ports   = ec2_value(ec2,"AUTHORIZEDPORTS")
144 145
        type    = ec2_value(ec2,"INSTANCETYPE")
146
	zone	= ec2_value(ec2,"AVAILABILITYZONE")
145 147

  
146 148
        if !ami
147 149
            send_message(ACTION[:deploy],RESULT[:failure],id,
......
152 154
        deploy_cmd = "#{EC2[:run]} #{ami}"
153 155
        deploy_cmd << " -k #{keypair}" if keypair
154 156
        deploy_cmd << " -t #{type}" if type
155

  
157
	deploy_cmd << " -z #{zone}" if zone
156 158
        deploy_exe = LocalCommand.run(deploy_cmd, log_method(id))
157 159

  
158 160
        if deploy_exe.code != 0