diff options
| author | adamedx <adamed@opscode.com> | 2014-03-31 09:49:27 -0700 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2014-03-31 09:49:27 -0700 |
| commit | 6eee4677d310bacad5c8564d59fa07d7dc4e5fbb (patch) | |
| tree | 69bdb84b6339553045c3a385e45783c5c8fea648 | |
| parent | 2c9fea1987fee94ef0e7adf7cfd3e39d8ec47b06 (diff) | |
| parent | 38401c7f1e642e0f141bb3ba204c67ae5b88f364 (diff) | |
| download | ohai-6eee4677d310bacad5c8564d59fa07d7dc4e5fbb.tar.gz | |
Merge branch 'OHAI-554' into adamed/merge-2014-03-31
| -rw-r--r-- | lib/ohai/plugins/cloud.rb | 2 | ||||
| -rw-r--r-- | spec/unit/plugins/cloud_spec.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/ohai/plugins/cloud.rb b/lib/ohai/plugins/cloud.rb index 37619eef..d1c28562 100644 --- a/lib/ohai/plugins/cloud.rb +++ b/lib/ohai/plugins/cloud.rb @@ -207,7 +207,9 @@ Ohai.plugin(:Cloud) do def get_azure_values cloud[:vm_name] = azure["vm_name"] cloud[:public_ips] << azure['public_ip'] + cloud[:public_ipv4] = azure['public_ip'] cloud[:public_fqdn] = azure['public_fqdn'] + cloud[:public_hostname] = azure['public_fqdn'] cloud[:public_ssh_port] = azure['public_ssh_port'] if azure['public_ssh_port'] cloud[:public_winrm_port] = azure['public_winrm_port'] if azure['public_winrm_port'] cloud[:provider] = "azure" diff --git a/spec/unit/plugins/cloud_spec.rb b/spec/unit/plugins/cloud_spec.rb index 78e7740f..1c44c823 100644 --- a/spec/unit/plugins/cloud_spec.rb +++ b/spec/unit/plugins/cloud_spec.rb @@ -165,6 +165,7 @@ describe Ohai::System, "plugin cloud" do @plugin[:azure]['public_ip'] = "174.129.150.8" @plugin.run @plugin[:cloud][:public_ips][0].should == @plugin[:azure]['public_ip'] + @plugin[:cloud][:public_ipv4].should == @plugin[:azure]['public_ip'] end it "populates cloud vm_name" do @@ -177,6 +178,7 @@ describe Ohai::System, "plugin cloud" do @plugin[:azure]['public_fqdn'] = "linux-vm-svc.cloudapp.net" @plugin.run @plugin[:cloud][:public_fqdn].should == @plugin[:azure]['public_fqdn'] + @plugin[:cloud][:public_hostname].should == @plugin[:azure]['public_fqdn'] end it "populates cloud public_ssh_port" do |