Commit 22a5d24c by Clinton Blackburn

Updated ansible-role-django-ida templates

- Properly escaping a double-brace element
- Removed unnecessary TODO

ECOM-2180
parent 0cd877b0
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
# and a key being provided via NEWRELIC_LICENSE_KEY # and a key being provided via NEWRELIC_LICENSE_KEY
{{ role_name|upper }}_NEWRELIC_APPNAME: "{{ '{{ COMMON_ENVIRONMENT }}' }}-{{ '{{ COMMON_DEPLOYMENT }}' }}-{{ '{{' }} {{ role_name }}_service_name }}" {{ role_name|upper }}_NEWRELIC_APPNAME: "{{ '{{ COMMON_ENVIRONMENT }}' }}-{{ '{{ COMMON_DEPLOYMENT }}' }}-{{ '{{' }} {{ role_name }}_service_name }}"
{{ role_name|upper }}_PIP_EXTRA_ARGS: "-i {{ '{{ COMMON_PYPI_MIRROR_URL }}' }}" {{ role_name|upper }}_PIP_EXTRA_ARGS: "-i {{ '{{ COMMON_PYPI_MIRROR_URL }}' }}"
{{ role_name|upper }}_NGINX_PORT: XXX # TODO Change this!!! {{ role_name|upper }}_NGINX_PORT: XXX # TODO Change this!!!
{{ role_name|upper }}_SSL_NGINX_PORT: XXX # TODO Change this!!!
{{ role_name|upper }}_DEFAULT_DB_NAME: '{{ role_name }}' {{ role_name|upper }}_DEFAULT_DB_NAME: '{{ role_name }}'
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
{{ role_name|upper }}_VERSION: "master" {{ role_name|upper }}_VERSION: "master"
{{ role_name|upper }}_DJANGO_SETTINGS_MODULE: "{{ role_name }}.settings.production" {{ role_name|upper }}_DJANGO_SETTINGS_MODULE: "{{ role_name }}.settings.production"
{{ role_name|upper }}_URL_ROOT: 'http://localhost:####' # TODO Set port number!
{{ role_name|upper }}_LMS_URL_ROOT: 'http://127.0.0.1:8000' {{ role_name|upper }}_LMS_URL_ROOT: 'http://127.0.0.1:8000'
{{ role_name|upper }}_SECRET_KEY: 'Your secret key here' {{ role_name|upper }}_SECRET_KEY: 'Your secret key here'
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
- name: create symlinks from the repo dir - name: create symlinks from the repo dir
file: file:
src: "{{ '{{' }} {{ role_name }}_code_dir }}/{{ item }}" src: "{{ '{{' }} {{ role_name }}_code_dir }}/{{ '{{' }} item }}"
dest: "{{ '{{' }} COMMON_BIN_DIR }}/{{ '{{' }} item.split('.')[0] }}.{{ role_name }}" dest: "{{ '{{' }} COMMON_BIN_DIR }}/{{ '{{' }} item.split('.')[0] }}.{{ role_name }}"
state: link state: link
with_items: with_items:
......
...@@ -15,5 +15,4 @@ export NEW_RELIC_LICENSE_KEY="{{ '{{' }} NEWRELIC_LICENSE_KEY }}" ...@@ -15,5 +15,4 @@ export NEW_RELIC_LICENSE_KEY="{{ '{{' }} NEWRELIC_LICENSE_KEY }}"
{{ '{%' }} endif -%} {{ '{%' }} endif -%}
source {{ '{{' }} {{ role_name }}_home }}/{{ role_name }}_env source {{ '{{' }} {{ role_name }}_home }}/{{ role_name }}_env
# TODO fix application
{{ '{{' }} executable }} -c {{ '{{' }} {{ role_name }}_home }}/{{ role_name }}_gunicorn.py {{ '{{' }} {{ role_name|upper }}_GUNICORN_EXTRA }} {{ role_name }}.wsgi:application {{ '{{' }} executable }} -c {{ '{{' }} {{ role_name }}_home }}/{{ role_name }}_gunicorn.py {{ '{{' }} {{ role_name|upper }}_GUNICORN_EXTRA }} {{ role_name }}.wsgi:application
...@@ -15,5 +15,4 @@ export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}" ...@@ -15,5 +15,4 @@ export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
{% endif -%} {% endif -%}
source {{ ecommerce_home }}/ecommerce_env source {{ ecommerce_home }}/ecommerce_env
# TODO fix application
{{ executable }} -c {{ ecommerce_home }}/ecommerce_gunicorn.py {{ ECOMMERCE_GUNICORN_EXTRA }} ecommerce.wsgi:application {{ executable }} -c {{ ecommerce_home }}/ecommerce_gunicorn.py {{ ECOMMERCE_GUNICORN_EXTRA }} ecommerce.wsgi:application
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