openstack/tripleo-ha-utils
Code Issues Proposed changes

Merge "repo_setup: Add sudo to specific commands for non-root running"

Browse Source
This commit is contained in:
Jenkins 2017-01-06 15:53:20 +00:00 committed by Gerrit Code Review
commit 9b9b90fa35
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/repo-setup/defaults/main.yml
View File

@ -9,13 +9,13 @@ stable:
- mitaka
- liberty
repo_cmd_before: |
yum install -y yum-plugin-priorities;
yum clean all;
rm -rf /etc/yum.repos.d/delorean*;
rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum install -y yum-plugin-priorities;
sudo yum clean all;
sudo rm -rf /etc/yum.repos.d/delorean*;
sudo rm -rf /etc/yum.repos.d/*.rpmsave;
repo_cmd_after: |
yum repolist;
yum update -y
sudo yum repolist;
sudo yum update -y
# Repositories definitions
repos:

8
roles/repo-setup/templates/repo_setup.sh.j2
View File

@ -18,7 +18,7 @@ else
sed -i "s/priority=.*/priority={{ repo.priority }}/g" /tmp/repo_role_tmp/{{ repo.filename }}
fi
{% endif %}
cp -f /tmp/repo_role_tmp/{{ repo.filename }} /etc/yum.repos.d/
sudo cp -f /tmp/repo_role_tmp/{{ repo.filename }} /etc/yum.repos.d/
{% endif %}
{% if repo.type == 'generic' %}
@ -41,14 +41,14 @@ enabled={{ repo.enabled|default('1') }}
{% if repo.down_url is defined %}# trunk_hash=${HASH:-}
{% endif %}
EOF
cp -f /tmp/repo_role_tmp/{{ repo.filename }} /etc/yum.repos.d/
sudo cp -f /tmp/repo_role_tmp/{{ repo.filename }} /etc/yum.repos.d/
{% endif %}
{% if repo.type == 'package' %}
{{ repo.custom_cmd|default('yum install -y') }} {{ repo.pkg_name|default(repo.pkg_url) }}
{{ repo.custom_cmd|default('sudo yum install -y') }} {{ repo.pkg_name|default(repo.pkg_url) }}
{% endif %}
{% endif %}
{% endfor %}
{{ repo_cmd_after|default('') }}
{{ repo_cmd_after|default('') }}