diff --git a/roles/autocloudreporter/tasks/main.yml b/roles/autocloudreporter/tasks/main.yml index 41a665e135..b1db75f10b 100644 --- a/roles/autocloudreporter/tasks/main.yml +++ b/roles/autocloudreporter/tasks/main.yml @@ -22,7 +22,7 @@ - name: Install required packages (Python 3) dnf: - name: ['python3-fedfind', 'python3-fedmsg', 'python3-resultsdb_api', + name: ['python2-pip, python3-fedfind', 'python3-fedmsg', 'python3-resultsdb_api', 'python3-resultsdb_conventions-fedora', 'python3-setuptools'] state: present when: "'python34-fedmsg' in group_names" @@ -33,7 +33,7 @@ find: paths: /usr/lib/python2.7/site-packages patterns: "autocloudreporter*" - register: py2acrinstalled + register: py2acrinstalled changed_when: "1 != 1" failed_when: "1 != 1" check_mode: no @@ -53,7 +53,7 @@ - restart fedmsg-hub - name: Remove autocloudreporter (Python 2) - command: "pip2 --disable-pip-version-check uninstall autocloudreporter" + command: "pip2 uninstall --disable-pip-version-check --yes autocloudreporter" when: "py2acrinstalled is defined and py2acrinstalled and 'python34-fedmsg' in group_names" notify: - restart fedmsg-hub diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index f81fa43e49..b568c87ab4 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -118,7 +118,7 @@ find: paths: /usr/lib/python2.7/site-packages patterns: "fedora_openqa*" - register: py2oqainstalled + register: py2oqainstalled changed_when: "1 != 1" failed_when: "1 != 1" check_mode: no @@ -132,7 +132,7 @@ - restart fedmsg-hub - name: Remove fedora_openqa (Python 2) - command: "pip2 --disable-pip-version-check uninstall fedora-openqa" + command: "pip2 uninstall --disable-pip-version-check --yes fedora-openqa" when: "py2oqainstalled is defined and py2oqainstalled and 'python34-fedmsg' in group_names" notify: - restart fedmsg-hub diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml index 2ff4a0bc2b..bbde021ad1 100644 --- a/roles/relvalconsumer/tasks/main.yml +++ b/roles/relvalconsumer/tasks/main.yml @@ -40,8 +40,8 @@ - name: Install required packages (Python 3) dnf: - name: ['python3-fedfind', 'python3-wikitcms', 'python3-fedmsg', 'python3-mwclient', - 'python3-setuptools', 'relval'] + name: ['python2-pip', 'python3-fedfind', 'python3-wikitcms', 'python3-fedmsg', + 'python3-mwclient', 'python3-setuptools', 'relval'] state: present when: "'python34-fedmsg' in group_names" tags: @@ -57,7 +57,7 @@ find: paths: /usr/lib/python2.7/site-packages patterns: "relvalconsumer*" - register: py2rvinstalled + register: py2rvinstalled changed_when: "1 != 1" failed_when: "1 != 1" check_mode: no @@ -112,7 +112,7 @@ - restart fedmsg-hub - name: Remove relvalconsumer (Python 2) - command: "pip2 uninstall relvalconsumer" + command: "pip2 --disable-pip-version-check --yes uninstall relvalconsumer" when: "py2rvinstalled is defined and py2rvinstalled and 'python34-fedmsg' in group_names" notify: - restart fedmsg-hub