aboutsummaryrefslogtreecommitdiffstats
path: root/ansible/roles/add_custom_repos
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-12-22 11:42:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-22 11:42:27 +0000
commitedb1b87fae318501b853ef02a7aa7dffddfe1e48 (patch)
treefefafa804e91d824c6a4b62b4f6d8c436a6e5ac2 /ansible/roles/add_custom_repos
parentd93f0b4e79bcf822dfb264a82e879f45038628d1 (diff)
parentc241da7a6d6218320a162efd714ddc4b1e064341 (diff)
Merge changes from topics 'YARDSTICK-875', 'YARDSTICK-874'
* changes: Check if multiverse repository is available in Ubuntu Specify supported architectures for Ubuntu backports repository
Diffstat (limited to 'ansible/roles/add_custom_repos')
-rw-r--r--ansible/roles/add_custom_repos/tasks/ubuntu.yml7
-rw-r--r--ansible/roles/add_custom_repos/templates/sources.list.j25
2 files changed, 11 insertions, 1 deletions
diff --git a/ansible/roles/add_custom_repos/tasks/ubuntu.yml b/ansible/roles/add_custom_repos/tasks/ubuntu.yml
index c0ba89c0b..4658fe514 100644
--- a/ansible/roles/add_custom_repos/tasks/ubuntu.yml
+++ b/ansible/roles/add_custom_repos/tasks/ubuntu.yml
@@ -12,6 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
+- name: Check multiverse repository
+ shell: "apt-cache policy | grep {{ release }}/multiverse"
+ args:
+ executable: /bin/bash
+ register: multiverse_repos
+ ignore_errors: yes
+
- name: add custom repos
template:
src: sources.list.j2
diff --git a/ansible/roles/add_custom_repos/templates/sources.list.j2 b/ansible/roles/add_custom_repos/templates/sources.list.j2
index af741cb10..61fbe43aa 100644
--- a/ansible/roles/add_custom_repos/templates/sources.list.j2
+++ b/ansible/roles/add_custom_repos/templates/sources.list.j2
@@ -1,5 +1,8 @@
{% if YARD_IMG_ARCH == "arm64" %}
deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ release }}-backports main restricted universe multiverse
{% else %}
-deb http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse
+ {% if multiverse_repos.rc != 0 %}
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ {{ release }} multiverse
+ {% endif %}
{% endif %}