873176 - [bedrock] Update configuration for prod and deploy

Status: VERIFIED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task)

Description

[Paul [:pmac] McLanahan]

+++ This bug was initially created as a clone of Bug #872797 +++

This is for bedrock production instance.

We can't use chief for this one because we've just shifted a bunch of code around. :jd helped us with the www-dev environment in bug 872704, so hopefully those steps will work here.

1. Sync down latest from master branch on github.

2. Move the local.py file: It moved from settings/local.py to bedrock/settings/local.py. This file is under puppet.

3. Delete old directories:

PWD='/data/www/www.allizom.org-django/bedrock'
# this is the dir on the webhead, not sure about admin
rm -rf $PWD/apps
rm -rf $PWD/settings
rm -rf $PWD/vendor-local/src/django

4. Modify bedrock/settings/local.py:

Remove the line 'from settings import *'
Add the line 'import logging'

5. Continue deployment.

All should be running correctly after this. If not please hit us up on #www and we'll figure it out.

Thanks!

Comment 1

[Chris Turra [:cturra]]

push to prod complete :) i manually ran though the update steps, as discussed in irc, so i could be certain everything completed without error.

[[e-mail]1 bedrock]# git pull
remote: Counting objects: 401, done.
remote: Compressing objects: 100% (256/256), done.
remote: Total 319 (delta 114), reused 208 (delta 37)
Receiving objects: 100% (319/319), 567.41 KiB | 1.05 MiB/s, done.
Resolving deltas: 100% (114/114), completed with 45 local objects.
From git://github.com/mozilla/bedrock
 + 11cb701...1f0db9d bug-865853-privacy-spam-prevention -> origin/bug-865853-privacy-spam-prevention  (forced update)
   d54c084..b5b9f83  master     -> origin/master
Fetching submodule vendor
remote: Counting objects: 7654, done.
remote: Compressing objects: 100% (2557/2557), done.
remote: Total 6207 (delta 2758), reused 5882 (delta 2628)
Receiving objects: 100% (6207/6207), 4.61 MiB | 2.60 MiB/s, done.
Resolving deltas: 100% (2758/2758), completed with 525 local objects.
From git://github.com/mozilla/playdoh-lib
   dfbc416..9327312  master     -> origin/master
 * [new branch]      upgrade-bleach-128 -> origin/upgrade-bleach-128
Fetching submodule vendor/src/bleach
remote: Counting objects: 291, done.
remote: Compressing objects: 100% (152/152), done.
remote: Total 273 (delta 182), reused 212 (delta 121)
Receiving objects: 100% (273/273), 44.49 KiB, done.
Resolving deltas: 100% (182/182), completed with 12 local objects.
From git://github.com/jsocol/bleach
 * [new branch]      branch-1.1.x -> origin/branch-1.1.x
 * [new branch]      branch-1.2.x -> origin/branch-1.2.x
 * [new branch]      conditional -> origin/conditional
   b902f35..ab7c8b3  master     -> origin/master
 * [new tag]         v1.1.5     -> v1.1.5
 * [new tag]         v1.2       -> v1.2
 * [new tag]         v1.2.1     -> v1.2.1
From git://github.com/jsocol/bleach
 * [new tag]         v1.1.2     -> v1.1.2
 * [new tag]         v1.1.3     -> v1.1.3
 * [new tag]         v1.1.4     -> v1.1.4
Fetching submodule vendor/src/commonware
remote: Counting objects: 101, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 87 (delta 57), reused 57 (delta 27)
Unpacking objects: 100% (87/87), done.
From git://github.com/jsocol/commonware
   e2e02ad..b554418  master     -> origin/master
 * [new tag]         v0.4.2     -> v0.4.2
From git://github.com/jsocol/commonware
 * [new tag]         v0.4.0     -> v0.4.0
 * [new tag]         v0.4.1     -> v0.4.1
Fetching submodule vendor/src/django-arecibo
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 3), reused 5 (delta 3)
Unpacking objects: 100% (5/5), done.
From git://github.com/andymckay/django-arecibo
   1194561..849d698  master     -> origin/master
Fetching submodule vendor/src/django-multidb-router
remote: Counting objects: 53, done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 44 (delta 20), reused 35 (delta 12)
Unpacking objects: 100% (44/44), done.
From git://github.com/jbalogh/django-multidb-router
   72f73a3..4f78662  master     -> origin/master
Fetching submodule vendor/src/django-sha2
remote: Counting objects: 44, done.
remote: Compressing objects: 100% (25/25), done.
remote: Total 34 (delta 9), reused 31 (delta 8)
Unpacking objects: 100% (34/34), done.
From git://github.com/fwenzel/django-sha2
   249aae2..f4519bf  master     -> origin/master
 * [new tag]         0.4        -> 0.4
Fetching submodule vendor/src/funfactory
remote: Counting objects: 178, done.
remote: Compressing objects: 100% (103/103), done.
remote: Total 144 (delta 96), reused 80 (delta 38)
Receiving objects: 100% (144/144), 21.79 KiB, done.
Resolving deltas: 100% (96/96), completed with 22 local objects.
From git://github.com/mozilla/funfactory
 * [new branch]      1.X        -> origin/1.X
   e1bbfe2..1d22d90  master     -> origin/master
 * [new tag]         1.0.1      -> 1.0.1
From git://github.com/mozilla/funfactory
 * [new tag]         2.2.0      -> 2.2.0
Fetching submodule vendor/src/jingo-minify
remote: Counting objects: 175, done.
remote: Compressing objects: 100% (106/106), done.
remote: Total 158 (delta 76), reused 134 (delta 52)
Receiving objects: 100% (158/158), 24.73 KiB, done.
Resolving deltas: 100% (76/76), completed with 5 local objects.
From git://github.com/jsocol/jingo-minify
   0548993..e232cd0  master     -> origin/master
Fetching submodule vendor/src/tower
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (43/43), done.
remote: Total 54 (delta 30), reused 35 (delta 11)
Unpacking objects: 100% (54/54), done.
From git://github.com/clouserw/tower
   599b621..70cd086  master     -> origin/master
You are not currently on a branch. Please specify which
branch you want to merge with. See git-pull(1) for details.

    git pull <remote> <branch>



[[e-mail]1 bedrock]# git checkout origin/master
warning: unable to rmdir vendor-local/src/django: Directory not empty
M	vendor
Previous HEAD position was d54c084... Merge pull request #868 from mozilla/bug-865433-firstrun-updates
HEAD is now at b5b9f83... Merge pull request #863 from craigcook/bug-867985-update-15-facts


[[e-mail]1 bedrock]# cp settings/local.py bedrock/settings/local.py

[[e-mail]1 bedrock]# vim bedrock/settings/local.py

[[e-mail]1 bedrock]# rm -rf apps

[[e-mail]1 bedrock]# rm -rf settings

[[e-mail]1 bedrock]# rm -rf vendor-local/src/django

[[e-mail]1 bedrock]# git submodule sync
Synchronizing submodule url for 'vendor'
Synchronizing submodule url for 'vendor-local/src/basket-client'
Synchronizing submodule url for 'vendor-local/src/django-dnt'
Synchronizing submodule url for 'vendor-local/src/django-statsd'
Synchronizing submodule url for 'vendor-local/src/feedparser'
Synchronizing submodule url for 'vendor-local/src/jingo-minify'
Synchronizing submodule url for 'vendor-local/src/pystatsd'
Synchronizing submodule url for 'vendor-local/src/tower'
[[e-mail]1 bedrock]# git submodule update
Submodule path 'vendor': checked out 'b9ee4a5392dcc589498100576cb0319b52de97b1'
[[e-mail]1 bedrock]# git submodule update --init --recursive
Submodule 'src/django-appconf' (git://github.com/jezdez/django-appconf.git) registered for path 'src/django-appconf'
Submodule 'src/django-compressor' (git://github.com/jezdez/django_compressor.git) registered for path 'src/django-compressor'
Submodule path 'src/bleach': checked out 'c381a906cb50c09889f5ced7b2a72fd1dcf9d9a8'
Cloning into 'src/django-appconf'...
remote: Counting objects: 341, done.
remote: Compressing objects: 100% (213/213), done.
remote: Total 341 (delta 207), reused 253 (delta 119)
Receiving objects: 100% (341/341), 49.50 KiB, done.
Resolving deltas: 100% (207/207), done.
Submodule path 'src/django-appconf': checked out 'd7ff3bb0c35a0c2ec83afdb31f7bb79e0f1b222c'
Submodule path 'src/django-arecibo': checked out '849d6980c5893a0d109693d2ae47b0a20880cfc7'
Cloning into 'src/django-compressor'...
remote: Counting objects: 4557, done.
remote: Compressing objects: 100% (2560/2560), done.
remote: Total 4557 (delta 2361), reused 4075 (delta 1945)
Receiving objects: 100% (4557/4557), 1.12 MiB | 1008 KiB/s, done.
Resolving deltas: 100% (2361/2361), done.
Submodule path 'src/django-compressor': checked out '90966edf9777a1c0b5f6389b15f5559a89081d39'
Submodule path 'src/django-sha2': checked out '3ba2b4771056fb722bc9fe52cf26918a3f0388bb'
Submodule path 'src/funfactory': checked out 'd77253061e1ed15a27efccb97d0517a7935f4026'
Submodule path 'src/jingo': checked out '1dc0e0bf4a0118ef53adc6967537a511152a040a'
Submodule path 'src/jingo-minify': checked out 'd2ffefbd31e5035873083107e86893be302ce452'
Submodule path 'src/tower': checked out '7711557f55fefa9526402b2731879edf9b128381'

Comment 2

[Paul [:pmac] McLanahan]

Huge Success \o/

Thanks Chris!