From 4bb60d517da45919310265fa241e1e76b63e97bd Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 28 Feb 2017 11:38:34 -0500 Subject: tools/ds-identify: look at cloud.cfg when looking for ec2 strict_id. In the interest of speed I had skipped the parsing of /etc/cloud/cloud.cfg for the ec2 strict_id setting. In hindsight it seems reasonable for people to put settings there. --- tools/ds-identify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/ds-identify b/tools/ds-identify index e618963b..9711a234 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -651,7 +651,7 @@ ec2_read_strict_setting() { # 3. look for the key 'strict_id' (datasource/Ec2/strict_id) local match="" bp="${PATH_CLOUD_CONFD}/cloud.cfg" - match="$bp.d/*[Ee][Cc]2*.cfg" + match="$bp $bp.d/*[Ee][Cc]2*.cfg" if check_config strict_id "$match"; then debug 2 "${_RET_fname} set strict_id to $_RET" return 0 -- cgit v1.2.3