From c935f66bb14bbba3747a37a195aa1c4f49d36219 Mon Sep 17 00:00:00 2001 From: Maciej Skrocki Date: Wed, 30 Aug 2017 18:29:31 -0700 Subject: Introduced default values and remove unnecessary ones from ansible code image build code. Change-Id: Id711d6fdacaddeafb8550290503d6cb6c814ea70 Signed-off-by: Maciej Skrocki --- ansible/roles/add_custom_repos/templates/sources.list.j2 | 4 ++-- ansible/roles/add_custom_repos/vars/main.yml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 ansible/roles/add_custom_repos/vars/main.yml (limited to 'ansible/roles/add_custom_repos') 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 -- cgit 1.2.3-korg