Commit d52fde1e by Jason Bau

Changes to make this run on @jbau 's machine

* remove capa from requirements, bump versions of dogapi and simplejson
* comment out stuff done to /etc/facter
* comment out pkg_version() b/c it needs  '../version-script/version.py'
parent 9390ee25
...@@ -258,21 +258,21 @@ def deploy(auto_migrate=False): ...@@ -258,21 +258,21 @@ def deploy(auto_migrate=False):
_install_gemfile(pkg) _install_gemfile(pkg)
_install_npm_package(pkg) _install_npm_package(pkg)
with dog_stats_api.timer(metric_name, tags=repo_tags + ['step:fact']): # with dog_stats_api.timer(metric_name, tags=repo_tags + ['step:fact']):
# drop a file for puppet so it knows that # # drop a file for puppet so it knows that
# code is installed for the service # # code is installed for the service
with cd('/etc/facter/facts.d'): # with cd('/etc/facter/facts.d'):
pkg_config = PackageInfo() # pkg_config = PackageInfo()
if pkg.repo_name in pkg_config.service_repos: # if pkg.repo_name in pkg_config.service_repos:
# facts can't have dashes so they are converted # # facts can't have dashes so they are converted
# to underscores # # to underscores
noopable(sudo)( # noopable(sudo)(
'echo "{0}_installed=true" > {0}_installed.txt'.format( # 'echo "{0}_installed=true" > {0}_installed.txt'.format(
pkg.repo_name.replace("-", "_"))) # pkg.repo_name.replace("-", "_")))
with dog_stats_api.timer(metric_name, tags=package_tags + # with dog_stats_api.timer(metric_name, tags=package_tags +
['step:pkg_version']): # ['step:pkg_version']):
pkg_version() # pkg_version()
with dog_stats_api.timer(metric_name, tags=package_tags + with dog_stats_api.timer(metric_name, tags=package_tags +
['step:post_commands']): ['step:post_commands']):
......
...@@ -5,12 +5,12 @@ WebOb==1.2.3 ...@@ -5,12 +5,12 @@ WebOb==1.2.3
argparse==1.2.1 argparse==1.2.1
beautifulsoup4==4.1.3 beautifulsoup4==4.1.3
boto==2.7.0 boto==2.7.0
capa==0.1 #capa==0.1
cloudformation==0.0.0 cloudformation==0.0.0
decorator==3.4.0 decorator==3.4.0
distribute==0.6.30 distribute==0.6.30
docopt==0.6.1 docopt==0.6.1
dogapi==1.1.2 dogapi==1.2.3
ipython==0.13.1 ipython==0.13.1
jenkinsapi==0.1.11 jenkinsapi==0.1.11
lxml==3.1beta1 lxml==3.1beta1
...@@ -24,7 +24,7 @@ pyrelic==0.2.0 ...@@ -24,7 +24,7 @@ pyrelic==0.2.0
python-dateutil==2.1 python-dateutil==2.1
requests==1.1.0 requests==1.1.0
schema==0.1.1 schema==0.1.1
simplejson==3.0.7 simplejson==3.3.0
simples3==1.0-alpha simples3==1.0-alpha
six==1.2.0 six==1.2.0
-e git+https://github.com/bos/statprof.py.git@a17f7923b102c9039763583be9e377e8422e8f5f#egg=statprof-dev -e git+https://github.com/bos/statprof.py.git@a17f7923b102c9039763583be9e377e8422e8f5f#egg=statprof-dev
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
- name: Create application root - name: Create application root
# In the future consider making group edx r/t adm # In the future consider making group edx r/t adm
file: path=$app_base_dir state=directory owner=root group=adm mode=2775 file: path={{ app_base_dir}} state=directory owner=root group=adm mode=2775
tags: tags:
- pre_install - pre_install
- update - update
- name: Create upload directory - name: Create upload directory
file: path=$app_base_dir/uploads mode=2775 state=directory owner=root group=adm file: path={{ app_base_dir }}/uploads mode=2775 state=directory owner=root group=adm
tags: tags:
- pre_install - pre_install
- update - update
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
- pre_install - pre_install
- update - update
- name: Create staticfiles dir
file: path={{ app_base_dir}}/staticfiles state=directory owner=root group=adm mode=2775
tags:
- pre_install
- update
- name: Install role-independent useful system packages - name: Install role-independent useful system packages
# do this before log dir setup; rsyslog package guarantees syslog user present # do this before log dir setup; rsyslog package guarantees syslog user present
apt: pkg={{item}} install_recommends=yes state=present update_cache=yes apt: pkg={{item}} install_recommends=yes state=present update_cache=yes
......
...@@ -28,6 +28,15 @@ ...@@ -28,6 +28,15 @@
- lms-env - lms-env
- update - update
- name: Change owner on staticfiles
file: path={{ app_base_dir }}/staticfiles state=directory owner=www-data group=www-data
tags:
- cms
- lms
- lms-env
- update
- name: Create lms log target directory - name: Create lms log target directory
file: path={{log_base_dir}}/lms state=directory owner=syslog group=adm mode=2770 file: path={{log_base_dir}}/lms state=directory owner=syslog group=adm mode=2770
tags: tags:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment