ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14907 from fatmcgav/openstack_fix_provider_test_os_image 

provider/openstack: Fix issue with providing OS_IMAGE_ID or OS_IMAGE_…
This commit is contained in:
Joe Topjian 2017-05-29 21:17:50 -06:00 committed by GitHub
parent 40ba1b5487 3c3c08a0cd
commit 6d0f507175
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/openstack/provider_test.go
View File

@ -39,8 +39,8 @@ func testAccPreCheck(t *testing.T) {
t.Fatal("OS_AUTH_URL must be set for acceptance tests") t.Fatal("OS_AUTH_URL must be set for acceptance tests")
} }
if OS_IMAGE_ID == "" || OS_IMAGE_NAME == "" { if OS_IMAGE_ID == "" && OS_IMAGE_NAME == "" {
t.Fatal("OS_IMAGE_ID and OS_IMAGE_NAME must be set for acceptance tests") t.Fatal("OS_IMAGE_ID or OS_IMAGE_NAME must be set for acceptance tests")
} }
if OS_POOL_NAME == "" { if OS_POOL_NAME == "" {