diff options
| author |   Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2017-11-30 14:13:34 +0000 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2017-12-22 10:45:09 +0000 |
| commit | c241da7a6d6218320a162efd714ddc4b1e064341 (patch) | |
| tree | 8876fb47ea4e0969ccf43b7cbc085560de80b7c3 /ansible | |
| parent | 4ba399eaf8ca3beff2dfa554f7f187e6d67b9073 (diff) | |
Check if multiverse repository is available in Ubuntu
In Ubuntu, multiverse repository is needed to install the image
dependencies [1]. If this repository is not enabled, it should be
added as part of the role "add_custom_repos".
[1] https://github.com/opnfv/yardstick/tree/master/ansible/roles/install_image_dependencies
JIRA: YARDSTICK-875
Change-Id: Ie37ebf87bf245185447f2b675568af9bd38219c0
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/add_custom_repos/tasks/ubuntu.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/add_custom_repos/templates/sources.list.j2 | 3 |
2 files changed, 10 insertions, 0 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 4b50f45ce..61fbe43aa 100644 --- a/ansible/roles/add_custom_repos/templates/sources.list.j2 +++ b/ansible/roles/add_custom_repos/templates/sources.list.j2 @@ -2,4 +2,7 @@ deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ release }}-backports main restricted universe multiverse {% else %} 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 %} |