Merge pull request #1032 from edx/derf/testing_abbey_private_build

Fixes to abbey external playbook support

playbooks/roles/edxapp/defaults/main.yml

@@ -506,7 +506,7 @@ worker_core_mult:
 edxapp_use_custom_theme: false
 edxapp_theme_name: ""
 edxapp_theme_source_repo: 'https://{{ COMMON_GIT_MIRROR }}/Stanford-Online/edx-theme.git'
-edxapp_theme_version: 'HEAD'
+edxapp_theme_version: 'master'
 
 # make this the public URL instead of writable
 edx_platform_repo: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-platform.git"

util/jenkins/build-ami.sh

@@ -96,6 +96,11 @@ if [[ ! -z "$configurationprivaterepo" ]]; then
   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

@@ -213,7 +213,7 @@ git_repo="https://github.com/edx/$git_repo_name"
 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)
@@ -221,7 +221,7 @@ 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 @@ rm -rf $base_dir
                 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,