cpu and memory limits

dockerContainer.yml

@@ -56,6 +56,7 @@
 
 
 
+
 #----------------------------------TEMPLATES----------------------------------
 #Only copy template files if there are templates defined in the incoming defintion dict
 - set_fact: templates_Defined=0
@@ -79,9 +80,9 @@
   loop_control:
     loop_var: outer_item
   when: templates_Defined ==1 and outer_item.value.generic is not defined
-  register: fileChanged
   tags: always
-
+  register: regular_template
+  notify: Restart container
   #Copy templates form a generic dir, allow ansible to search
 - name: "Generic template mappings for {{ container_Name }}"
   #Files will be copied to the 'config' dir as defined by container_configDir, they will be stored using their template file name but with the '.j2' stripped
@@ -91,9 +92,9 @@
   loop_control:
     loop_var: outer_item
   when: templates_Defined ==1 and outer_item.value.generic is defined
-  register: fileChanged
   tags: always
-
+  register: generic_template
+  notify: Restart container
 - name: Append templated files to the mapping list
   set_fact:
     #build a list to pass to docker containing the source of the file(As on disk on the host) and the destination mount within the container
@@ -133,8 +134,9 @@
   loop_control:
     loop_var: outer_item
   when: files_Defined == 1 and outer_item.value.generic is not defined and outer_item.value.src_text is not defined
-  register: fileChanged
   tags: always
+  register: file_copy
+  notify: Restart container
 #Copy files from a generic dir, allow ansible to search
 - name: "Generic File mappings for {{ container_Name }}"
   #Files will be copied to the 'config' dir as defined by container_configDir, they will be stored using their file name
@@ -144,8 +146,9 @@
   loop_control:
     loop_var: outer_item
   when: files_Defined == 1 and outer_item.value.generic is defined and outer_item.value.src_text is not defined
-  register: fileChanged
   tags: always
+  register: generic_copy
+  notify: Restart container  
 #Create files based on the suplied src_text param
 - name: "Text based file creation for {{ container_Name }}"
   #Files will be copied to the 'config' dir as defined by container_configDir, they will be stored using their file name
@@ -155,8 +158,9 @@
   loop_control:
     loop_var: outer_item
   when: files_Defined == 1 and outer_item.value.src_text is defined
-  register: fileChanged
   tags: always
+  register: text_copy
+  notify: Restart container
 
 - name: Append static remote files to the mapping list
   set_fact:
@@ -197,7 +201,6 @@
   loop_control:
     loop_var: outer_item
   when: local_Defined == 1
-  register: fileChanged
   tags: always
 #----------------------------------/LOCAL----------------------------------
 
@@ -214,15 +217,11 @@
   tags: always
 #----------------------------------/Check ENV----------------------------------
 
-<<<<<<< HEAD
 - name: Restart the container if fileChanged is defined
-  set_fact: item.value.restart='yes'
-  when: fileChanged is defined
+  set_fact: containerRestart1='yes'
+  when: (containerRestart is defined and containerRestart=='yes') or (item.value.restart is defined and item.value.restart =='yes')
 
-=======
 
-#TODO - If a confile file or volume is changed, trestart the container
->>>>>>> 4f62020d89990a6ff0b6ec67f986f613e77f308f
 
 - name: "Container {{ container_Name }}"
   become: yes
@@ -234,7 +233,7 @@
     recreate: "{{ item.value.recreate | default('false') }}"
     image: "{{ item.value.image }}"
     state: "{{ item.value.start | default ('started') }}"
-    restart: "{{ item.value.restart | default ('no') }}"
+    restart: "{{ containerRestart1 | default ('no') }}"
     restart_policy: "{{ item.value.restart_policy | default ('always') }}"
     purge_networks: "{{ item.value.purge_networks | default ('yes') }}"
     networks: "{{ net_checked }}"
@@ -244,9 +243,17 @@
     network_mode: "{{ item.value.network_mode | default ('default') }}"
     shm_size: "{{ item.value.shm_size | default ('64M') }}"
     ports: "{{ item.value.ports | default ([]) }}"
+    cpu_period: "{{ item.value.cpu_period | default(0) }}"
+    cpu_quota: "{{ item.value.cpu_quota | default(0) }}"
+    cpu_shares: "{{ item.value.cpu_shares | default(0) }}"
+    cpus: "{{ item.value.cpus | default(0) }}"
+    cpuset_cpus: "{{ item.value.cpuset_cpus | default('') }}"
+    mem_limit: "{{ item.value.mem_limit | default(0) }}"
+    mem_reservation: "{{ item.value.mem_reservation | default(0) }}"    
     #log_driver: fluentd
     #"{{item.value.ports | default ([json-file])}}"
     #log_options:
     #  fluentd-sub-second-precision: true
     #  tag: myservice
   tags: always
+