Merge 8c0328a into 78707b7

bootstrap_cfn/fab_tasks.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+import os.path
 from StringIO import StringIO
 import sys
 import random
@@ -16,21 +17,20 @@
 from bootstrap_cfn.iam import IAM
 
 
+# This is needed because pkgutil wont pick up modules
+# imported in a fabfile.
+path = env.real_fabfile or os.getcwd()
+sys.path.append(os.path.dirname(path))
 
 # GLOBAL VARIABLES
 env.application = None
 env.environment = None
 env.aws = None
-env.config = None
-env.password = None
+env.config = os.path.join(path, 'cloudformation', 'template.yaml')
+env.password = os.path.join(path, 'cloudformation', 'template-secrets.yaml')
 TIMEOUT = 3600
 RETRY_INTERVAL = 10
 
-# This is needed because pkgutil wont pick up modules
-# imported in a fabfile.
-path = env.real_fabfile or os.getcwd()
-sys.path.append(os.path.dirname(path))
-
 
 @task
 def aws(x):