openstack/openstack-ansible
Code Issues Proposed changes

Update AIO script to support ubuntu-ports

Browse Source 
With the merge of [1], the way the bootstrap AIO script evaluates
the sources.list file for ubuntu was changed, which inadvertently
broke any distros using ubuntu-ports. This patch fixes the regex
to support ubuntu-ports repos.

[1] I7fab8f3c072e25fa8138c3e37d764b36d17526d6

Change-Id: I7ecd9dc130d194342e236bef42b08926f98940fd
This commit is contained in:
Adam Reznechek 2016-09-20 19:53:20 -05:00
parent d331013138
commit 5098998d64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/roles/bootstrap-host/tasks/install-apt.yml
View File

@ -21,7 +21,7 @@
- apt-install-prerequisites - apt-install-prerequisites
- name: Determine the existing Ubuntu repo configuration - name: Determine the existing Ubuntu repo configuration
shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\/?)(?= {{ ansible_distribution_release }} main)" /etc/apt/sources.list' shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\S*\/?)(?= {{ ansible_distribution_release }} main)" /etc/apt/sources.list'
register: ubuntu_repo register: ubuntu_repo
when: when:
- bootstrap_host_ubuntu_repo is not defined - bootstrap_host_ubuntu_repo is not defined
@ -30,7 +30,7 @@
- find-apt-repo - find-apt-repo
- name: Determine the existing Ubuntu Security repo configuration - name: Determine the existing Ubuntu Security repo configuration
shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\/?)(?= {{ ansible_distribution_release }}-security main)" /etc/apt/sources.list' shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\S*\/?)(?= {{ ansible_distribution_release }}-security main)" /etc/apt/sources.list'
register: ubuntu_security_repo register: ubuntu_security_repo
when: when:
- bootstrap_host_ubuntu_security_repo is not defined - bootstrap_host_ubuntu_security_repo is not defined