openstack/tripleo-operator-ansible
Code Issues Proposed changes

Fix tripleo_repos role

Browse Source 
We accidently renamed the tripleo-repos rpm and command when we renamed
the role from tripleo-repos to tripleo_repos.  Additionally we didn't
have return_content for the uri request to find the rpm url so it wasn't
working correctly.

Change-Id: I14ccb1583740592daa3f98ca50ac5c59303a25cd
This commit is contained in:
Alex Schultz
2020-02-06 16:07:35 -07:00
parent 839ce64263
commit b64e78c60d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/tripleo_repos/tasks/install.yml
View File

@@ -12,19 +12,19 @@
- name: Grab repo package list
uri:
url: "{{ _tripleo_repos_repo_url }}"
return_content:
return_content: true
retries: 10
delay: 3
register: _tripleo_repos_repo_data
- name: Find rpm name
set_fact:
_tripleo_repos_rpm: "{{ _tripleo_repos_repo_data.content | regex_search('python[0-9]-tripleo_repos-[a-z0-9-.]+\\.rpm') }}"
_tripleo_repos_rpm: "{{ _tripleo_repos_repo_data.content | regex_search('python[0-9]-tripleo-repos-[a-z0-9-.]+\\.rpm') }}"
- name: Fail if rpm is missing
fail:
msg: Unable to find tripleo_repos rpm
when: _tripleo_repos_rpm|length == 0
- name: Install tripleo_repos
- name: Install tripleo-repos
yum:
name: "{{ _tripleo_repos_repo_url }}{{ _tripleo_repos_rpm }}"
state: present

10
roles/tripleo_repos/tasks/main.yml
View File

@@ -11,14 +11,14 @@
- name: Gather the rpm package facts
package_facts:
- name: Install tripleo_repos
- name: Install tripleo-repos
include_tasks: install.yml
when: (ansible_facts.distribution_major_version|int <= 7 and not 'python2-tripleo_repos' in ansible_facts.packages) or
(ansible_facts.distribution_major_version|int <= 8 and not 'python3-tripleo_repos' in ansible_facts.packages)
when: (ansible_facts.distribution_major_version|int <= 7 and not 'python2-tripleo-repos' in ansible_facts.packages) or
(ansible_facts.distribution_major_version|int <= 8 and not 'python3-tripleo-repos' in ansible_facts.packages)
- name: Run tripleo_repos
- name: Run tripleo-repos
command: >-
tripleo_repos
tripleo-repos
-b {{ tripleo_repos_branch }}
{{ tripleo_repos_extra_args | join(' ') }}
{{ tripleo_repos_version }}