Move vars to playbook

diff --git a/ch13/ansible/container.yml b/ch13/ansible/container.yml
index c398f65..39c7f90 100644 (file)
--- a/ch13/ansible/container.yml
+++ b/ch13/ansible/container.yml
@@ -3,22 +3,11 @@ defaults:
   database_name: mezzanine
   database_user: mezzanine
   database_password: mezzanine
-  secret_key: b495a05c396843b6b47ac944a72c92ed
-  nevercache_key: b5d87bb4e17c483093296fa321056bdc
-  twitter_access_token_key: 80b557a3a8d14cb7a2b91d60398fb8ce
-  twitter_access_token_secret: 1974cf8419114bdd9d4ea3db7a210d90
-  twitter_consumer_key: 1f1c627530b34bb58701ac81ac3fad51
-  twitter_consumer_secret: 36515c2b60ee4ffb9d33d972a7ec350a
-  mezzanine_root_dir: /srv
   mezzanine_proj_app: mezzanine_example
   mezzanine_proj_name: "{{ mezzanine_proj_app }}"
   locale: en_US.UTF-8
   database_host: postgres
   database_port: 5432
-  live_hostname: localhost
-  domains:
-    - localhost
-    - 127.0.0.1
 
 services:
   #  nginx:

diff --git a/ch13/ansible/roles/mezzanine/vars/main.yml b/ch13/ansible/roles/mezzanine/vars/main.yml
index 5037c0f..8543db4 100644 (file)
--- a/ch13/ansible/roles/mezzanine/vars/main.yml
+++ b/ch13/ansible/roles/mezzanine/vars/main.yml
@@ -1,5 +1,6 @@
 ---
 # vars file for mezzanine
+mezzanine_root_dir: /srv
 mezzanine_user: "{{ ansible_user }}"
 mezzanine_venv_home: "{{ mezzanine_root_dir }}/.virtualenvs"
 mezzanine_venv_path: "{{ mezzanine_venv_home }}/{{ mezzanine_proj_name }}"
@@ -12,3 +13,18 @@ mezzanine_python: "{{ mezzanine_venv_path }}/bin/python"
 mezzanine_manage: "{{ mezzanine_python }} {{ mezzanine_proj_path }}/manage.py"
 mezzanine_num_workers: "multiprocessing.cpu_count() * 2 + 1"
 mezzanine_gunicorn_procname: gunicorn_mezzanine
+
+# Eventually, we will pass these as env vars
+database_name: mezzanine
+database_user: mezzanine
+database_password: mezzanine
+secret_key: b495a05c396843b6b47ac944a72c92ed
+nevercache_key: b5d87bb4e17c483093296fa321056bdc
+twitter_access_token_key: 80b557a3a8d14cb7a2b91d60398fb8ce
+twitter_access_token_secret: 1974cf8419114bdd9d4ea3db7a210d90
+twitter_consumer_key: 1f1c627530b34bb58701ac81ac3fad51
+twitter_consumer_secret: 36515c2b60ee4ffb9d33d972a7ec350a
+live_hostname: localhost
+domains:
+  - localhost
+  - 127.0.0.1