Merge pull request #518 from CodeNow/SAN-4693-add-mem-limit

add memory limit and make syslog optional

Author: anandkumarpatel

ansible/group_vars/alpha-api.yml

@@ -8,6 +8,8 @@ hosted_ports: [ "{{ api_port }}" ]
 redis_key: frontend:{{ api_hostname }}
 is_redis_update_required: yes
 
+memory_hard_limit: 1g
+
 # for container settings
 container_envs: >
   {{ api_base_container_envs }}

ansible/roles/container_kill_start/tasks/main.yml

@@ -66,16 +66,21 @@
 - name: start container
   tags: deploy
   become: yes
-  command: >
-    docker run
-    --log-driver={{ log_driver }}
-    --log-opt syslog-facility={{ log_facility }}
-    --log-opt tag="{{ log_tag | default ( name ) }}"
-    -v {{ app_log_dir }}:{{ app_log_dir }}:rw
-    --restart={{ restart_policy | default('always') }}
-    {{ container_run_opts }}
-    {{ container_image }}:{{ container_tag }}
-    {{ container_run_args }}
+  command: |
+    docker run \
+    {% if memory_hard_limit is defined %}
+      --memory {{ memory_hard_limit }} \
+    {% endif %}
+    --log-driver={{ log_driver }} \
+    {% if log_driver == "syslog" %}
+      --log-opt syslog-facility={{ log_facility }} \
+      --log-opt tag="{{ log_tag | default ( name ) }}" \
+    {% endif %}
+    -v {{ app_log_dir }}:{{ app_log_dir }}:rw \
+    --restart={{ restart_policy | default('always') }} \
+    {{ container_run_opts | trim }} \
+    {{ container_image }}:{{ container_tag }} \
+    {{ container_run_args | trim }}
   register: new_container_id
   notify:
     - get new container ports

ansible/roles/container_start/tasks/main.yml

@@ -39,9 +39,14 @@
   shell: |
     for i in {{ '{' }}1..{{ number_of_containers }}{{ '}' }}; do
       docker run \
+        {% if memory_hard_limit is defined %}
+          --memory {{ memory_hard_limit }} \
+        {% endif %}
         --log-driver={{ log_driver }} \
-        --log-opt syslog-facility={{ log_facility }} \
-        --log-opt tag="{{ log_tag | default ( name ) }}" \
+        {% if log_driver == "syslog" %}
+          --log-opt syslog-facility={{ log_facility }} \
+          --log-opt tag="{{ log_tag | default ( name ) }}" \
+        {% endif %}
         -v {{ app_log_dir }}:{{ app_log_dir }}:rw \
         -v /dev/log:/dev/log:rw \
         --restart={{ restart_policy | default('no') }} \