cloud-mu 3.5.0 → 3.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/mu-azure-setup +2 -2
- data/cloud-mu.gemspec +2 -2
- data/modules/mu/providers/aws/role.rb +1 -1
- data/modules/mu/providers/azure.rb +5 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0cd5b504fe2b0d27e79f230789f429d4d7d4b52605f1f4372d446702a6ff569f
|
4
|
+
data.tar.gz: cff87a2712d10180ebd9aaf2be422b4b26e7f6b8fc82bc35679a62377ef6b478
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: db01b8662ffc919c11b4c01184077c697bb66003a420512f68c4b9a8b0914c1aced6b5e15a67412a05448a6ece99f42f4a9b84697798c2ef284a4642c8bf5203
|
7
|
+
data.tar.gz: 7defbf9d70c17698d0d3e579683ad5dadf3ede4cd75b46960cc107977f736a24b716cfbd0ccb1e21c79c909a976167aa21ba9894ea9f81317c64a115dcec5067
|
data/bin/mu-azure-setup
CHANGED
@@ -47,12 +47,12 @@ Usage:
|
|
47
47
|
opt :optdisk, "Create a block volume for /opt and slide our installation onto it", :require => false, :default => false, :type => :boolean
|
48
48
|
end
|
49
49
|
|
50
|
-
if MU::Cloud::Azure.hosted? and !$MU_CFG['
|
50
|
+
if MU::Cloud::Azure.hosted? and !$MU_CFG['azure']
|
51
51
|
new_cfg = $MU_CFG.dup
|
52
52
|
cfg_blob = MU::Cloud::Azure.hosted_config
|
53
53
|
if cfg_blob
|
54
54
|
cfg_blob['log_bucket_name'] ||= $MU_CFG['hostname']
|
55
|
-
new_cfg["
|
55
|
+
new_cfg["azure"] = { "default" => cfg_blob }
|
56
56
|
MU.log "Adding auto-detected Azure stanza to #{cfgPath}", MU::NOTICE
|
57
57
|
if new_cfg != $MU_CFG or !cfgExists?
|
58
58
|
MU.log "Generating #{cfgPath}"
|
data/cloud-mu.gemspec
CHANGED
@@ -17,8 +17,8 @@ end
|
|
17
17
|
|
18
18
|
Gem::Specification.new do |s|
|
19
19
|
s.name = 'cloud-mu'
|
20
|
-
s.version = '3.5.
|
21
|
-
s.date = '2021-
|
20
|
+
s.version = '3.5.1'
|
21
|
+
s.date = '2021-02-25'
|
22
22
|
s.require_paths = ['modules']
|
23
23
|
s.required_ruby_version = '>= 2.4'
|
24
24
|
s.summary = "The eGTLabs Mu toolkit for unified cloud deployments"
|
@@ -328,7 +328,7 @@ end
|
|
328
328
|
version_id: p.default_version_id
|
329
329
|
).policy_version
|
330
330
|
|
331
|
-
doc = JSON.parse
|
331
|
+
doc = JSON.parse URI.decode_www_form_component old.document
|
332
332
|
need_update = false
|
333
333
|
|
334
334
|
doc["Statement"].each { |s|
|
@@ -565,12 +565,12 @@ MU.log "vault existence check #{vaultname}", MU::WARN, details: resp
|
|
565
565
|
return @@metadata if svc == "instance" and @@metadata
|
566
566
|
base_url = "http://169.254.169.254/metadata/#{svc}"
|
567
567
|
args["api-version"] = api_version
|
568
|
-
arg_str = args.keys.map { |k| k.to_s+"="+args[k].to_s }.join("&")
|
568
|
+
arg_str = args.keys.sort.map { |k| k.to_s+"="+CGI.escape(args[k].to_s) }.join("&")
|
569
569
|
|
570
570
|
begin
|
571
571
|
Timeout.timeout(2) do
|
572
|
-
resp = JSON.parse(URI.open("#{base_url}
|
573
|
-
MU.log "curl -H Metadata:true "+"#{base_url}
|
572
|
+
resp = JSON.parse(URI.open("#{base_url}?#{arg_str}","Metadata"=>"true").read)
|
573
|
+
MU.log "curl -H Metadata:true "+"#{base_url}?#{arg_str}", loglevel, details: resp
|
574
574
|
if svc != "instance"
|
575
575
|
return resp
|
576
576
|
else
|
@@ -597,9 +597,9 @@ MU.log "vault existence check #{vaultname}", MU::WARN, details: resp
|
|
597
597
|
cfg = credConfig(credentials)
|
598
598
|
|
599
599
|
if cfg and MU::Cloud::Azure.hosted?
|
600
|
-
token = MU::Cloud::Azure.get_metadata("identity/oauth2/token", "
|
600
|
+
token = MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2020-09-01", args: { "resource"=>"https://management.azure.com/" })
|
601
601
|
if !token
|
602
|
-
MU::Cloud::Azure.get_metadata("identity/oauth2/token", "
|
602
|
+
MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2020-09-01", args: { "resource"=>"https://management.azure.com/" }, debug: true)
|
603
603
|
raise MuError, "Failed to get machine oauth token"
|
604
604
|
end
|
605
605
|
machine = MU::Cloud::Azure.get_metadata
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cloud-mu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.5.
|
4
|
+
version: 3.5.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- John Stange
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2021-
|
14
|
+
date: 2021-02-25 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: addressable
|