diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-01 07:34:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-01 07:34:41 +0000 |
| commit | f7a3cef287979664d1812cdd4dd88276732ec8b8 (patch) | |
| tree | be9a227350e0b6f1f13431fa98ca0f1896593088 /ansible/roles/add_custom_repos | |
| parent | a87c0902f957beaf93e62f3aeb48584caf871a27 (diff) | |
| parent | c935f66bb14bbba3747a37a195aa1c4f49d36219 (diff) | |
Merge "Introduced default values and remove unnecessary ones from ansible code image build code."
Diffstat (limited to 'ansible/roles/add_custom_repos')
| -rw-r--r-- | ansible/roles/add_custom_repos/templates/sources.list.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/add_custom_repos/vars/main.yml | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ansible/roles/add_custom_repos/templates/sources.list.j2 b/ansible/roles/add_custom_repos/templates/sources.list.j2 index 86be348f6..af741cb10 100644 --- a/ansible/roles/add_custom_repos/templates/sources.list.j2 +++ b/ansible/roles/add_custom_repos/templates/sources.list.j2 @@ -1,5 +1,5 @@ {% if YARD_IMG_ARCH == "arm64" %} -deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ ubuntu_release[target_os_version] }}-backports main restricted universe multiverse +deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ release }}-backports main restricted universe multiverse {% else %} -deb http://archive.ubuntu.com/ubuntu/ {{ ubuntu_release[target_os_version] }}-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse {% endif %} diff --git a/ansible/roles/add_custom_repos/vars/main.yml b/ansible/roles/add_custom_repos/vars/main.yml deleted file mode 100644 index 03ed6e446..000000000 --- a/ansible/roles/add_custom_repos/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -ubuntu_release: - "16.04": xenial - "14.04": trusty
\ No newline at end of file |