proper variable naming and passing

util/jenkins/build-ami.sh

@@ -89,13 +89,18 @@ if [[ ! -z "$playbook_dir" ]]; then
 fi
 
 configurationprivate_params=""
-if [[ ! -z "$configurationprivate-repo" ]]; then
-  configurationprivate_params="--configuration-private-repo $configurationprivate-repo"
-  if [[ ! -z "$configurationprivate-version" ]]; then
-    configurationprivate_params="$configurationprivate_params --configuration-private-version $configurationprivate-version"
+if [[ ! -z "$configurationprivaterepo" ]]; then
+  configurationprivate_params="--configuration-private-repo $configurationprivaterepo"
+  if [[ ! -z "$configurationprivateversion" ]]; then
+    configurationprivate_params="$configurationprivate_params --configuration-private-version $configurationprivateversion"
   fi
 fi
 
+stackname_params=""
+if [[ ! -z "$playbook_dir" ]]; then
+  stackname_params="--playbook-dir $playbook_dir"
+fi
+
 cd configuration
 pip install -r requirements.txt
 

util/vpc-tools/abbey.py

@@ -61,7 +61,7 @@ def parse_args():
                         metavar="PLAY", required=True)
     parser.add_argument('--playbook-dir',
                         help='directory to find playbooks in',
-                        default='configuration/playbooks/edx-east'
+                        default='configuration/playbooks/edx-east',
                         metavar="PLAYBOOKDIR", required=False)
     parser.add_argument('-d', '--deployment', metavar="DEPLOYMENT",
                         required=True)
@@ -213,15 +213,15 @@ def create_instance_args():
 git_repo_secure="{configuration_secure_repo}"
 git_repo_secure_name="{configuration_secure_repo_basename}"
 git_repo_private="{configuration_private_repo}"
-git_repo_private_basename=$(basename $git_repo_private)
+git_repo_private_name=$(basename $git_repo_private .git)
 secure_vars_file="$base_dir/$git_repo_secure_name/{secure_vars}"
 instance_id=\\
 $(curl http://169.254.169.254/latest/meta-data/instance-id 2>/dev/null)
 instance_ip=\\
 $(curl http://169.254.169.254/latest/meta-data/local-ipv4 2>/dev/null)
 instance_type=\\
 $(curl http://169.254.169.254/latest/meta-data/instance-type 2>/dev/null)
-playbook_dir="$base_dir/{playbook-dir}"
+playbook_dir="$base_dir/{playbook_dir}"
 
 if $config_secure; then
     git_cmd="env GIT_SSH=$git_ssh git"
@@ -323,9 +323,12 @@ def create_instance_args():
                 configuration_secure_repo=args.configuration_secure_repo,
                 configuration_secure_repo_basename=os.path.basename(
                     args.configuration_secure_repo),
+                configuration_private_version=args.configuration_private_version,
+                configuration_private_repo=args.configuration_private_repo,
                 environment=args.environment,
                 deployment=args.deployment,
                 play=args.play,
+                playbook_dir=args.playbook_dir,
                 config_secure=config_secure,
                 identity_contents=identity_contents,
                 queue_name=run_id,