From 55baaadf3ee21bf5769ee791533b66d28f9455ef Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Tue, 29 Dec 2015 17:27:25 +0800 Subject: bugfix: opencontrail add force parameter for apt-get install JIRA: COMPASS-227 Change-Id: I4e9ae9dfed29f6d58c9200d21f09cf2a71961ca1 Signed-off-by: chenshuai@huawei.com --- .../ansible/roles/open-contrail/tasks/install/install-collector.yml | 2 +- .../ansible/roles/open-contrail/tasks/install/install-common.yml | 3 +++ .../ansible/roles/open-contrail/tasks/install/install-compute.yml | 4 ++-- .../ansible/roles/open-contrail/tasks/install/install-config.yml | 2 +- .../ansible/roles/open-contrail/tasks/install/install-control.yml | 2 +- .../ansible/roles/open-contrail/tasks/install/install-database.yml | 2 +- .../ansible/roles/open-contrail/tasks/install/install-kernel.yml | 2 +- .../ansible/roles/open-contrail/tasks/install/install-webui.yml | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/install') diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml index 5dbf9244..cac370e4 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml @@ -12,5 +12,5 @@ - name: "install contrail openstack analytics package" # apt: # name: "contrail-openstack-analytics" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: collector_packages diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml index 3a57fdf0..e963e160 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml @@ -20,6 +20,7 @@ # sudo: True apt: deb: "/tmp/{{ package }}" + force: yes - name: "delete temporary contrail install package" # sudo: True @@ -56,6 +57,7 @@ # sudo: True apt: deb: "{{ item }}" + force: yes with_items: required_packages.stdout_lines ignore_errors: True @@ -91,3 +93,4 @@ apt: name: "contrail-setup" update_cache: yes + force: yes diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml index 6c85ce55..3703522d 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml @@ -18,7 +18,7 @@ # name: "contrail-vrouter-3.13.0-40-generic" # when: ansible_kernel == "3.13.0-40-generic" # sudo: True - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: vrouter_packages when: ansible_kernel == kernel_required @@ -27,7 +27,7 @@ # name: "contrail-vrouter-dkms" # when: ansible_kernel != "3.13.0-40-generic" # sudo: True - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: dkms_packages when: ansible_kernel != kernel_required diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml index 1d493f58..e8d4f040 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml @@ -20,5 +20,5 @@ # sudo: True # apt: # name: "contrail-openstack-config" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: config_packages diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml index 7e917d16..a1f53076 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml @@ -20,5 +20,5 @@ # sudo: True # apt: # name: "contrail-openstack-control" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: control_packages diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml index 68c5946b..364fc8e3 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml @@ -13,5 +13,5 @@ # sudo: True # apt: # name: "contrail-openstack-database" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: database_packages diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml index 8b0e3347..f1ccfede 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml @@ -11,7 +11,7 @@ # name: "linux-image-3.13.0-40-generic" # name: "linux-image-extra-3.13.0-40-generic" # when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: kernel_packages | union(kernel_packages_noarch) when: (kernel_install) and (ansible_kernel != kernel_required) diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml index 22156ca3..727c4947 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml @@ -14,5 +14,5 @@ # sudo: True # apt: # name: "contrail-openstack-webui" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" with_items: webui_packages -- cgit 1.2.3-korg