clean up bare variables

parent 613cf13a
......@@ -15,7 +15,7 @@
mode: "0644"
owner: "{{ analytics_pipeline_user }}"
group: "{{ analytics_pipeline_user }}"
with_dict: ANALYTICS_PIPELINE_DATABASES
with_dict: "{{ ANALYTICS_PIPELINE_DATABASES }}"
tags:
- devstack:start
......
......@@ -52,7 +52,10 @@
- devstack:start
roles:
- insights
- role: insights
INSIGHTS_CONFIG_OVERRIDES:
DEBUG: "true"
ENABLE_INSECURE_STATIC_FILES: "true"
tasks:
......@@ -66,19 +69,6 @@
tags:
- devstack:start
- name: set configuration vars
lineinfile:
dest: "{{ COMMON_CFG_DIR }}/{{ insights_service_name }}.yml"
regexp: '^{{ item.key }}:'
line: '{{ item.key }}: {{ item.value }}'
with_items:
- key: DEBUG
value: "true"
- key: ENABLE_INSECURE_STATIC_FILES
value: "true"
tags:
- devstack:start
# Since the docker container mounts the user's working directory as a volume, it likely doesn't contain the
# "node_modules" directory that is needed to run bower
- name: install node dependencies
......
......@@ -68,7 +68,7 @@
args:
chdir: "{{ analytics_pipeline_code_dir }}"
become_user: "{{ analytics_pipeline_user }}"
environment: analytics_pipeline_install_env
environment: "{{ analytics_pipeline_install_env }}"
tags:
- install
- install:app-requirements
......@@ -78,7 +78,7 @@
args:
chdir: "{{ analytics_pipeline_code_dir }}"
become_user: "{{ analytics_pipeline_user }}"
environment: analytics_pipeline_install_env
environment: "{{ analytics_pipeline_install_env }}"
tags:
- install
- install:app-requirements
......@@ -88,7 +88,7 @@
args:
chdir: "{{ analytics_pipeline_code_dir }}"
become_user: "{{ analytics_pipeline_user }}"
environment: analytics_pipeline_install_env
environment: "{{ analytics_pipeline_install_env }}"
tags:
- devstack
- devstack:install
......
......@@ -69,19 +69,13 @@
- install
- install:system-requirements
- name: debug some stuff
debug: var=hive_site_config
tags:
- install
- install:system-requirements
- name: hive configured
hadoop_configuration:
property: "{{ item.key }}"
value: "{{ item.value }}"
path: "{{ HIVE_CONF }}/hive-site.xml"
become_user: "{{ hadoop_common_user }}"
with_dict: hive_site_config
with_dict: "{{ hive_site_config }}"
tags:
- install
- install:system-requirements
......
......@@ -139,6 +139,8 @@ INSIGHTS_CONFIG:
CMS_COURSE_SHORTCUT_BASE_URL: "{{ INSIGHTS_CMS_COURSE_SHORTCUT_BASE_URL }}"
LEARNER_API_LIST_DOWNLOAD_FIELDS: "{{ INSIGHTS_LEARNER_API_LIST_DOWNLOAD_FIELDS }}"
INSIGHTS_CONFIG_OVERRIDES: {}
INSIGHTS_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-analytics-api"
INSIGHTS_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
INSIGHTS_NGINX_PORT: "18110"
......
......@@ -15,7 +15,7 @@ dependencies:
- supervisor
- role: edx_service
edx_service_name: "{{ insights_service_name }}"
edx_service_config: "{{ INSIGHTS_CONFIG }}"
edx_service_config: "{{ INSIGHTS_CONFIG|combine(INSIGHTS_CONFIG_OVERRIDES) }}"
edx_service_repos: "{{ INSIGHTS_REPOS }}"
edx_service_user: "{{ insights_user }}"
edx_service_home: "{{ insights_home }}"
......
......@@ -22,10 +22,10 @@
#
- name: install application requirements
pip: >
name="{{ item }}"
virtualenv="{{ luigid_venv_dir }}"
state=present
pip:
name: "{{ item }}"
virtualenv: "{{ luigid_venv_dir }}"
state: present
become_user: "{{ luigid_user }}"
with_items: "{{ luigid_python_requirements }}"
tags:
......@@ -33,10 +33,10 @@
- install:app-requirements
- name: install luigi
pip: >
name="{{ luigid_code_dir }}"
virtualenv="{{ luigid_venv_dir }}"
state=present
pip:
name: "{{ luigid_code_dir }}"
virtualenv: "{{ luigid_venv_dir }}"
state: present
become_user: "{{ luigid_user }}"
tags:
- install
......@@ -54,10 +54,12 @@
- install:base
- name: configuration installed
template: >
src={{ item }}.j2
dest={{ luigid_conf_dir }}/{{ item }}
mode=0640 owner={{ luigid_user }} group={{ luigid_user }}
template:
src: "{{ item }}.j2"
dest: "{{ luigid_conf_dir }}/{{ item }}"
mode: "0640"
owner: "{{ luigid_user }}"
group: "{{ luigid_user }}"
with_items:
- logging.conf
- client.cfg
......@@ -65,10 +67,12 @@
- install
- name: upstart scripts installed
template: >
src={{ item }}.j2
dest=/etc/init/{{ item }}
mode=0640 owner=root group=root
template:
src: "{{ item }}.j2"
dest: "/etc/init/{{ item }}"
mode: "0640"
owner: root
group: root
with_items:
- luigid.conf
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