Updated integration tests

spec/integration/cleanup.rb

@@ -1,4 +1,4 @@
-# Copyright: Copyright (c) 2013 Chef, Inc.
+# Copyright: Copyright (c) 2013-2014 Chef Software, Inc.
 # License: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Author:: Siddheshwar More (<[email protected]>)
+
 require 'mixlib/shellout'
 
 module CleanupTestResources

spec/integration/config/environment.yml.sample

@@ -1,25 +1,13 @@
 # FIXME For now we will fetch the  creds from a config file
-
-os_creds:
-  openstack_username: openstack_username
-  openstack_password: openstack_password
-  openstack_tenant: openstack_tenant
-  openstack_auth_url: openstack_auth_url
-
-os_ssh_params:
-  key_pair: key_pair
-  ssh_user: ubuntu
-  ssh_user_for_windows: ssh_user_for_windows
-  ssh_password_for_windows: ssh_password_for_windows
-
-os_winrm_params:
-  winrm_user: winrm_user
-  winrm_password: winrm_password
-
-os_params:
-  linux_image: linux_image
-  windows_image: windows_image
-  ssh_enabled_windows_image: ssh_enabled_windows_image
-  linux_flavor: linux_flavor
-  windows_flavor: windows_flavor
-  invalid_flavor: invalid_flavor
+OPENSTACK_KEY_PAIR: OPENSTACK_KEY_PAIR
+OS_SSH_USER: OS_SSH_USER
+OS_WINDOWS_SSH_USER: OS_WINDOWS_SSH_USER
+OS_WINDOWS_SSH_PASSWORD: OS_WINDOWS_SSH_PASSWORD
+OS_WINRM_USER: OS_WINRM_USER
+OS_WINRM_PASSWORD: OS_WINRM_PASSWORD
+OS_LINUX_IMAGE: OS_LINUX_IMAGE
+OS_WINDOWS_IMAGE: OS_WINDOWS_IMAGE
+OS_WINDOWS_SSH_IMAGE: OS_WINDOWS_SSH_IMAGE
+OS_LINUX_FLAVOR: OS_LINUX_FLAVOR
+OS_WINDOWS_FLAVOR: OS_WINDOWS_FLAVOR
+OS_INVALID_FLAVOR: OS_INVALID_FLAVOR