Merge branch 'release/3.1.0'

chhofi · Aug 4, 2015 · 0c1b0b0 · 0c1b0b0
2 parents d7e9e46 + dff49e3
commit 0c1b0b0
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 36 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.0
+current_version = 3.1.0
 files = docs/source/conf.py
 commit = True
 tag = False

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -17,8 +17,8 @@
 copyright = u'2015, David Zuber'
 author = u'David Zuber'
 
-version = '3.0.0'
-release = '3.0.0'
+version = '3.1.0'
+release = '3.1.0'
 
 language = None
 

diff --git a/docs/source/django.rst b/docs/source/django.rst
@@ -41,6 +41,8 @@ The main things to note are the locations of the ``manage.py``, ``wsgi.py`` file
 
 For Celery_ it is expected that the app is ``{{ application_name }}``. You should import the celery app in ``myproject/myproject/__init__.py`` or change the ``celery_worker_app`` variable. See the `Celery documentation <Celerydocumentation_>`_.
 
+For the ``celerycam`` role, Djcelery_ is required to be in ``INSTALLED_APPS`` so one can track the status of the workers and tasks.
+
 Also, if your app needs additional system packages installed, you can add them in ``roles/web/tasks/install_additional_packages.yml``.
 
 --------
@@ -98,3 +100,4 @@ Here is a sample from the test project::
 .. _Cookiecutter-Django: https://github.com/RayCrafter/cookiecutter-django
 .. _Celerydocumentation: http://docs.celeryproject.org/en/latest/django/first-steps-with-django.html#using-celery-with-django
 .. _Celery: http://www.celeryproject.org/
+.. _Djcelery: https://pypi.python.org/pypi/django-celery
diff --git a/env_vars/secret.yml b/env_vars/secret.yml
@@ -1,33 +1,66 @@
 $ANSIBLE_VAULT;1.1;AES256
-30383963633036396438656366663139636330383664613334366336303961396633653765383730
-3538666164653036383731393639356362643233616661640a336365613366373639306631386131
-31613834343861316663373639303562623465626330323965616165313465313932626638386537
-6265373133643333330a356437383735333039613363343339363438323830633930633233356466
-61393938383762366461303831333232383464616338366163306136313338366633623065333364
-65386431626262356439323234646662313465353933353137303965663136316236663234336538
-66303564623062333631623165343666666162313137653764623461383134626563613833663334
-35343136653535633230663439313265613635336339373563366661666261633134623531656533
-36646638393662623532383033613061633863636165346162383731313863633061386537626335
-37633762353339333965376566323237633662333966386664653437653731373433356338653933
-39316332323866626363313032646666653337313333633039306333623833346330393636633332
-36393230343839366539633666366639336139623932356638386461306438663936336134366333
-31303635323035333339306139356234366261303963333638313332623863353634323139373265
-38623861666332363263636135303130356161653063386336646437303863303032663966633931
-36386565636632636161313030323832333865643163613338623461633331623836663733336263
-63383933343439326461633831323534313935656638363838656134346662633832633331613531
-64383532303866663666353836383830663833303334666338353364373536363566353135633730
-37306361613263666565313936316665376336633861643334373862623762393831353232646233
-37366536643463663061353065623732663061393734623736663361386639616465323730383265
-34626564613233623639316562653736323032393032373061303030326237343139616564316137
-33383761616530626264383763616233663335653364633362663631353539346537323037633665
-36643539366566643539626333396161353961353734313534386138346561623033326535376365
-36666530613363393665386263323930356165323030656533643632383139383163353736633964
-34393461653531386537653461356337636630666462393434303333373762626365396237363438
-31323034613031366564323533653337666136313938333861396365636230313337343231623534
-38363862663738386662303634323632393439393863386165666634336139636436366136343139
-34313330343732616664326639353431336539373434306231323234356439363737366337326239
-66653766356165376462616462306338313065616237636339363236303861373464623864316534
-30326161613534373462613539383039386363316466336132623565323433376364323962306164
-36306330393666633338343565656264393239356562393836356138626135623462656632623364
-31643631636132303038316562343264363839323137343131386561623033653939653438326363
-38316463633262623232
+36353532633636333137633339316662313330326535363237643664616336393532356237376636
+6465646138383733616237626436343032383032386435630a373634386564333839646264613663
+39643261346637383734343232366535313861633064323365613463316535313035653930636464
+3232353232343830380a346137333530613039623433363831393131356633313138313033323331
+39363634303531643937383735323030653466363464663534373737363131663635353638643462
+31376437663863313236313530383431356536353337333639363732613832393362363561643030
+37626431373033346432613465373462623733376162636234393138326465316533323330323837
+33303231346132623130356430336366643966393866383137346230313539653066373366346136
+31353961646562353861656333303239326236626530303261643434363531373332356633373030
+31336563313630323034663364646661653964646639343536376566336536613861626665383366
+34636231346665366461663563643462666234386262663664613235623563393162663966323163
+35376532383339643733386564343930333761333939616238303834633939373866393530356463
+64636131393036633333356130373935313462613766663132383139336438663433613132633236
+36366131376466343233386335393163333830643633623433383664356436653836613631313731
+35646531336636666665396263623133623664373565363862613833666666383136366133666533
+64393664323761633065623731353231623064383432333138306534333437393162363233393265
+65353333313836393563393634343563663161663861326530303538373236363261353666656438
+30626131333831323066636337653532336433383139343233656432363964333636373265666634
+66316336326534303133303530663564613563373265663365346465393639333732363035303166
+63333733613663313464623561663562343938373864373735643336306637666632656565333632
+34323661373863376662353337336436376362396532343730623735653562383161323733363439
+61396261656361343563363362646231363966626261376362393862613130643266333339613136
+61323233393330643936646363353635363361616131616133326439326332623633663738633934
+38393234326536313639323533366237666136636530303839646338306634633931653336663134
+64373132626665633837323030333963316139323931343862383336613937323038666566366535
+38633864326634323338626130636165333538383239393533303137383936336135383465633131
+32313262313331623938326566643264623439316232373132623264396233366235376462323065
+38653263613162623830663232303061316231633137623737623063326166333539663636646636
+35343261376234623235323135333335633264636363656532643766333863383665303464346664
+64353639633830303035656365333830323665373038336337333063656664353965383737383937
+66383232623239343866643561373566623432326138303039346163623536326436356462643539
+64343830396534396231303434333163656338656163303638626135333431323062656162313933
+38333832666136633638623961376235376334316436323634396463646631353164363937376364
+30326631363833346235373165643932363464363164376132633862303138386361386137373138
+62636436373839383138313331303063663836363764363763343639313232663662633937623738
+62623063613038326430613964326435366365643864623835633830393233643934663130636331
+33326530303363336562366133383434373962343332623531333932353532386633663130663964
+61333636383165336536306563636334356164363063316338633261316161653831376265376432
+35633636343831623564633663626131663833643966376337613332616262313965303935343935
+34326632616536353437643363633332393064386330363637333030306464306132623138323735
+61643030393238636436656461656237383665373964323362663861383032353839633931653136
+37646137303562383132643334653266376336326532393239383737326666633964396638383832
+65393435656465353932373639343633343464383661666465363962333462653466316637386562
+64316464656461313236313832306136386636613866316564633831643966613961656631323834
+32313335623539363666306336646232666433303535666132646562313736306236623866316138
+62313261613265653464393262343264363931656335316433653833356630323334393637383533
+30613164666638656630646431353031646433623335323464653533353866313830666563646535
+61666164386636646138353964336135303035383630383836613931333838313431616265616163
+35646461333661333935333837333731646663633932303666303434623736326636356364656336
+66643663333738363964306235656632373132313862626235633933333364353530383936323166
+66666233316335313364623136373637386162373537333365383162653735393164343934313530
+35333837383264333831363932346635386238656234393736343866306462393230383835356664
+33323436643861336564313636343864356463363361386637653562643364336435346630353631
+35653661383038306663306362333033323637353363623537393566303066333233353532313133
+65383262313263306638303434353030323163656362633639363132353039616664633237396235
+33613561336639323937323837653531616533653631626233383432376531616163343965313637
+34303364616337326662646164653634666363383930623161393664333233346463306262663738
+66333839636332663336353238313830306630383532303863633336383166346338626438636465
+37353261356635366235663638356466313430643130646364636562393234653938346430626238
+66356464386235636161656666653061653733303462336338316538623337306562623863346266
+37363439656633333133613664333661336138323831373131373461663334383363643362656431
+34333434363366653737346334653364383762616632643736356330666334643366363934633635
+64386132326533363832313339613836393363646334633662323164376535376539643538373139
+64343065353532326636393066346462323839626662396430383166353330333530376434363431
+6339
diff --git a/roles/hlrsvenv/tasks/main.yml b/roles/hlrsvenv/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Add public ssh key of masterserver
+- name: Add public ssh key of crafternodes
   authorized_key: user={{ ansible_ssh_user }}
                   key="{{ lookup('file', playbook_dir + '/files/ssh/id_rsa.pub') }}"