Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
configuration
Commits
b309ac13
Commit
b309ac13
authored
Nov 05, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
factoring out common vars into a separate file
parent
bc7f9353
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
37 deletions
+35
-37
util/jenkins/ansible-deploy.sh
+4
-28
util/jenkins/ansible-provision.sh
+7
-9
util/jenkins/create-var-file.sh
+24
-0
No files found.
util/jenkins/ansible-deploy.sh
View file @
b309ac13
...
...
@@ -26,47 +26,23 @@ fi
extra_vars
=
"/var/tmp/extra-vars-
$$
.yml"
if
[[
-z
$deploy_host
]]
;
then
deploy_host
=
"
${
github_username
}
.m.sandbox.edx.org"
fi
source
"
$dir
/create-var-file.sh"
cat
<<
EOF
>
$extra_vars
---
EDXAPP_PREVIEW_LMS_BASE: preview.
${
deploy_host
}
EDXAPP_LMS_BASE:
${
deploy_host
}
EDXAPP_LMS_NGINX_PORT: 80
EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
EDXAPP_CMS_NGINX_PORT: 80
# vars specific to deploy added to $extra-vars
cat
<<
EOF
>>
$extra_vars
edx_platform_commit:
$edxapp_version
forum_version:
$forum_version
xqueue_version:
$xqueue_version
xserver_version:
$xserver_version
ora_version:
$ora_version
ease_version:
$ease_version
ansible_ssh_private_key_file: /var/lib/jenkins/
${
keypair
}
.pem
COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
COMMON_GIT_MIRROR: 'git.edx.org'
migrate_only: '
$run_migration
'
XSERVER_GRADER_DIR: "{{ xserver_data_dir }}/data/content-mit-600x~2012_Fall"
XSERVER_GRADER_SOURCE: "git@github.com:/MITx/6.00x.git"
XSERVER_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
CERTS_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
CERTS_AWS_KEY:
$(
cat
/var/lib/jenkins/certs-aws-key
)
CERTS_AWS_ID:
$(
cat
/var/lib/jenkins/certs-aws-id
)
CERTS_BUCKET: "verify-test.edx.org"
migrate_db: "yes"
openid_workaround: True
EOF
cat
$extra_vars
echo
"Deploying to
$deploy_host
"
...
...
util/jenkins/ansible-provision.sh
View file @
b309ac13
...
...
@@ -63,13 +63,13 @@ if [[ -z $instance_type ]]; then
fi
cat
<<
EOF
>
$extra_vars
---
EDXAPP_PREVIEW_LMS_BASE: preview.
${
dns_name
}
.
${
dns_zone
}
EDXAPP_LMS_BASE:
${
dns_name
}
.
${
dns_zone
}
EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
EDXAPP_CMS_NGINX_PORT: 80
ansible_ssh_private_key_file: /var/lib/jenkins/
${
keypair
}
.pem
deploy_host
=
"
${
dns_name
}
.
${
dns_zone
}
"
# creates a var file
source
"
$dir
/create-var-file.sh"
# vars specific to provisioning added to $extra-vars
cat
<<
EOF
>>
$extra_vars
dns_name:
$dns_name
keypair:
$keypair
instance_type:
$instance_type
...
...
@@ -79,8 +79,6 @@ region: $region
instance_tags: '{"environment": "
$environment
", "github_username": "
$github_username
", "Name": "
$name_tag
", "source": "jenkins", "owner": "
$BUILD_USER
"}'
root_ebs_size:
$root_ebs_size
name_tag:
$name_tag
COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
COMMON_GIT_MIRROR: 'git.edx.org'
gh_users:
- jarv
- feanil
...
...
util/jenkins/create-var-file.sh
0 → 100644
View file @
b309ac13
cat
<<
EOF
>
$extra_vars
---
ansible_ssh_private_key_file: /var/lib/jenkins/
${
keypair
}
.pem
EDXAPP_PREVIEW_LMS_BASE: preview.
${
deploy_host
}
EDXAPP_LMS_BASE:
${
deploy_host
}
EDXAPP_LMS_NGINX_PORT: 80
EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
EDXAPP_CMS_NGINX_PORT: 80
COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
COMMON_GIT_MIRROR: 'git.edx.org'
XSERVER_GRADER_DIR: "{{ xserver_data_dir }}/data/content-mit-600x~2012_Fall"
XSERVER_GRADER_SOURCE: "git@github.com:/MITx/6.00x.git"
XSERVER_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
CERTS_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
CERTS_AWS_KEY:
$(
cat
/var/lib/jenkins/certs-aws-key
)
CERTS_AWS_ID:
$(
cat
/var/lib/jenkins/certs-aws-id
)
CERTS_BUCKET: "verify-test.edx.org"
migrate_db: "yes"
openid_workaround: True
EOF
cat
$extra_vars
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment