Commits · release-focaccia · edx / configuration · GitLab

30 Jan, 2014 16 commits
- Merge branch 'master' into release · f18833c7
  John Jarvis committed Jan 30, 2014
  
  f18833c7 Browse Files
- fixing vm.box name · ba0fd895
  John Jarvis committed Jan 30, 2014
  
  ba0fd895 Browse Files
- Merge pull request #729 from edx/jarv/focaccia · b56ffe09
```
Jarv/focaccia
```
  John Jarvis committed Jan 30, 2014
  b56ffe09 Browse Files
- Merge pull request #728 from edx/jarv/focaccia · 300238d1
```
Jarv/focaccia
```
  John Jarvis committed Jan 30, 2014
  300238d1 Browse Files
- updating ami · 38fc11c9
  John Jarvis committed Jan 30, 2014
  
  38fc11c9 Browse Files
- updating the ami for ansible-provision · 39f55850
  John Jarvis committed Jan 30, 2014
  
  39f55850 Browse Files
- adding the demo role to vagrant-devstack · 40af3962
  John Jarvis committed Jan 30, 2014
  
  40af3962 Browse Files
- updating vagrantfiles for focaccia · 1df1a361
  John Jarvis committed Jan 30, 2014
  
  1df1a361 Browse Files
- Merge pull request #726 from edx/feanil/mckinsey_abbey · 5fb78b90
```
Feanil/mckinsey abbey
```
  Feanil Patel committed Jan 30, 2014
  5fb78b90 Browse Files
- Fix a typo. · 26ed997e
  Feanil Patel committed Jan 30, 2014
  
  26ed997e Browse Files
- Add a play tag to subnets that house application servers. · ab7ff8eb
  Feanil Patel committed Jan 30, 2014
  
  ab7ff8eb Browse Files
- fixing region typo · 6d50b431
  John Jarvis committed Jan 30, 2014
  
  6d50b431 Browse Files
- default vars for the edx_provision play · 136909da
```
These vars are also set by the jenkins job
```
  John Jarvis committed Jan 30, 2014
  136909da Browse Files
- Remove PropagateAtLaunche from security groups. · 4505442f
  Feanil Patel committed Jan 30, 2014
  
  4505442f Browse Files
- Merge pull request #725 from edx/jarv/worker-before-edxapp · 5c25ac72
```
runs the worker role before the edxapp role
```
  John Jarvis committed Jan 30, 2014
  5c25ac72 Browse Files
- Merge pull request #708 from edx/cg/no_more_hash_merge_ever · 9ae8b0ca
```
Remove hash_behaviour=merge
```
  Carson Gee committed Jan 30, 2014
  9ae8b0ca Browse Files
29 Jan, 2014 24 commits
- runs the worker role before the edxapp role · 9241f7cd
```
Because the CMS uses the git hash of the edx-platform for the
static path it can be problematic if you update the edx-platform
repo for the worker AFTER you update the edx-platform repo
for edxapp.  When running the edxapp role in worker mode
rake gather_assets is skipped.

This is a workaround but we may want to consider using separate
repos for worker and edxapp for situations where both are installed
on the same server.
```
  John Jarvis committed Jan 29, 2014
  9241f7cd Browse Files
- Merge pull request #724 from edx/e0d/automating-edxapp · 757fbcb1
```
E0d/automating edxapp
```
  e0d committed Jan 29, 2014
  757fbcb1 Browse Files
- Removing unneeded touch. · 904cdf80
  e0d committed Jan 29, 2014
  
  904cdf80 Browse Files
- Comments. · 67b3147d
  e0d committed Jan 29, 2014
  
  67b3147d Browse Files
- post testing, updating default to proper value. · 6e15d7f5
  e0d committed Jan 29, 2014
  
  6e15d7f5 Browse Files
- accidental checkin · c6fb9651
  e0d committed Jan 29, 2014
  
  c6fb9651 Browse Files
- changing inclusion strategy, adding template. · 4994e440
  e0d committed Jan 29, 2014
  
  4994e440 Browse Files
- Figure out the security group for the play by tag instead of getting it passed in. · 22de696a
  Feanil Patel committed Jan 29, 2014
  
  22de696a Browse Files
- Add tags to server security groups so abbey can find them easily. · 2ab4a2d0
  Feanil Patel committed Jan 29, 2014
  
  2ab4a2d0 Browse Files
- Don't pass in the common var file. · 7880fc4f
  Feanil Patel committed Jan 29, 2014
  
  7880fc4f Browse Files
- Merge pull request #723 from edx/jarv/update-dns-script · 1065e035
```
updating vpc dns script to conform to the new dns scheme
```
  John Jarvis committed Jan 29, 2014
  1065e035 Browse Files
- adding when condition back. · 1f23089b
  e0d committed Jan 29, 2014
  
  1f23089b Browse Files
- Removing authorized keys file from role. · 64c8a664
  e0d committed Jan 29, 2014
  
  64c8a664 Browse Files
- generalization. · 20bb11d3
  e0d committed Jan 29, 2014
  
  20bb11d3 Browse Files
- updating vpc dns script to conform to the new dns scheme · 9aebd806
```
* pep8 updates
* adding more comments
* refactoring
* adding examples
```
  John Jarvis committed Jan 29, 2014
  9aebd806 Browse Files
- recovered code, working. · b8c44c9d
  e0d committed Jan 29, 2014
  
  b8c44c9d Browse Files
- wip · 27de59bf
  e0d committed Jan 29, 2014
  
  27de59bf Browse Files
- Merge pull request #715 from edx/jarv/role-to-play · d8d74e56
```
changing role to play
```
  John Jarvis committed Jan 29, 2014
  d8d74e56 Browse Files
- Merge pull request #721 from edx/feanil/cfn_db_version · 81fd0f47
```
Make the DB version configurable and set it to 5.6 by default.
```
  Feanil Patel committed Jan 29, 2014
  81fd0f47 Browse Files
- Make the DB version configurable and set it to 5.6 by default. · ff653f44
  Feanil Patel committed Jan 29, 2014
  
  ff653f44 Browse Files
- Merge pull request #720 from edx/e0d/forum-typo · d874ab6e
```
type fix.
```
  e0d committed Jan 29, 2014
  d874ab6e Browse Files
- type fix. · 0f4f5f37
  e0d committed Jan 29, 2014
  
  0f4f5f37 Browse Files
- Merge pull request #719 from edx/feanil/admin_stack · 616ae06b
```
Feanil/admin stack
```
  Feanil Patel committed Jan 29, 2014
  616ae06b Browse Files
- Skip untagged instances. · 83ea04c4
  Feanil Patel committed Jan 29, 2014
  
  83ea04c4 Browse Files