Remove artifacts containers

They are not needed after unpacking artifacts and "exited" containers tend to confuse users. This change removes those containers after their job is done. Also removed config path parameter to agent since agent was fixed and uses that path by default. Change-Id: Ibb36e82382b5b73c6d43dd619e66062e90ddefec Partial-Bug: #1803027
Juniper · Nov 26, 2018 · 46fc979 · 46fc979
1 parent b7527a5
commit 46fc979
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/playbooks/roles/contrail_cnm_windows/tasks/main.yml b/playbooks/roles/contrail_cnm_windows/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: extract CNM plugin MSI from container
   win_shell: >
-    docker run -v {{ win_host_artifacts_dir }}:{{ win_container_artifacts_dir }}
+    docker run --rm -v {{ win_host_artifacts_dir }}:{{ win_container_artifacts_dir }}
     {{ container_registry }}/contrail-windows-cnm-plugin:{{ contrail_configuration.CONTRAIL_VERSION }}
 
 - name: install CNM plugin

diff --git a/playbooks/roles/contrail_vrouter_windows/tasks/main.yml b/playbooks/roles/contrail_vrouter_windows/tasks/main.yml
@@ -17,7 +17,7 @@
 
 - name: extract vrouter artifacts from container
   win_shell: >
-    docker run -v {{ win_host_artifacts_dir }}:{{ win_container_artifacts_dir }}
+    docker run --rm -v {{ win_host_artifacts_dir }}:{{ win_container_artifacts_dir }}
     {{ container_registry }}/contrail-windows-vrouter:{{ contrail_configuration.CONTRAIL_VERSION }}
 
 - name: copy debug dlls to compute node
@@ -144,5 +144,3 @@
     stdout_file: "{{ win_agent_nssm_log_path }}"
     stderr_file: "{{ win_agent_nssm_log_path }}"
     state: present
-    app_parameters_free_form: >
-      --config_file="{{ win_agent_config_path }}"