From 2c19010ff9a936c5d0ad3d72e2015308c105ff0f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 30 Sep 2015 12:48:13 +0100 Subject: [PATCH] Allow pip extra arguments to be passed to playbooks This patch adds the variable 'pip_install_options' which is passed to the pip install module as extra arguments in order to allow the use of options like '--force-reinstall' when executing playbooks. eg: openstack-ansible -e pip_install_options="--force-reinstall" \ setup-openstack.yml This is required due to constant upstream changes in dependencies which result in python wheel version upgrades and downgrades between tagged versions of openstack-ansible. The intention is that this can be used whenever a deployer switches between tags for both upgrades and downgrades. DocImpact Closes-Bug: #1489251 Closes-Bug: #1499451 Related-Bug: #1501114 Change-Id: I996185e009a4c4af4f23798619bdbd0d490360c9 --- playbooks/roles/galera_client/tasks/galera_client_install.yml | 1 + playbooks/roles/galera_server/tasks/galera_install.yml | 1 + playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml | 1 + playbooks/roles/os_cinder/tasks/cinder_install.yml | 1 + playbooks/roles/os_glance/tasks/glance_install.yml | 1 + playbooks/roles/os_heat/tasks/heat_install.yml | 1 + playbooks/roles/os_horizon/tasks/horizon_install.yml | 1 + playbooks/roles/os_keystone/tasks/keystone_install.yml | 1 + playbooks/roles/os_neutron/tasks/neutron_install.yml | 1 + playbooks/roles/os_nova/tasks/nova_install.yml | 1 + playbooks/roles/os_swift/tasks/swift_install.yml | 1 + playbooks/roles/os_tempest/tasks/tempest_install.yml | 1 + playbooks/roles/py_from_git/tasks/main.yml | 1 + playbooks/roles/rabbitmq_server/tasks/rabbitmq_install.yml | 1 + playbooks/roles/repo_server/tasks/repo_install.yml | 1 + playbooks/utility-install.yml | 1 + 16 files changed, 16 insertions(+) diff --git a/playbooks/roles/galera_client/tasks/galera_client_install.yml b/playbooks/roles/galera_client/tasks/galera_client_install.yml index 434c2175f6..802918d740 100644 --- a/playbooks/roles/galera_client/tasks/galera_client_install.yml +++ b/playbooks/roles/galera_client/tasks/galera_client_install.yml @@ -40,6 +40,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/galera_server/tasks/galera_install.yml b/playbooks/roles/galera_server/tasks/galera_install.yml index 66f3d8b75d..1269a9ad37 100644 --- a/playbooks/roles/galera_server/tasks/galera_install.yml +++ b/playbooks/roles/galera_server/tasks/galera_install.yml @@ -51,6 +51,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml b/playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml index d187505902..77a855b3ca 100644 --- a/playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml +++ b/playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml @@ -32,6 +32,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_cinder/tasks/cinder_install.yml b/playbooks/roles/os_cinder/tasks/cinder_install.yml index 7b789ffd1d..eac778d1e2 100644 --- a/playbooks/roles/os_cinder/tasks/cinder_install.yml +++ b/playbooks/roles/os_cinder/tasks/cinder_install.yml @@ -40,6 +40,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_glance/tasks/glance_install.yml b/playbooks/roles/os_glance/tasks/glance_install.yml index 4af2e9ff7a..f67fb86cfc 100644 --- a/playbooks/roles/os_glance/tasks/glance_install.yml +++ b/playbooks/roles/os_glance/tasks/glance_install.yml @@ -41,6 +41,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_heat/tasks/heat_install.yml b/playbooks/roles/os_heat/tasks/heat_install.yml index 5a6e8a3e05..9302cfc014 100644 --- a/playbooks/roles/os_heat/tasks/heat_install.yml +++ b/playbooks/roles/os_heat/tasks/heat_install.yml @@ -40,6 +40,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_horizon/tasks/horizon_install.yml b/playbooks/roles/os_horizon/tasks/horizon_install.yml index 002eafd3c3..674a0cb276 100644 --- a/playbooks/roles/os_horizon/tasks/horizon_install.yml +++ b/playbooks/roles/os_horizon/tasks/horizon_install.yml @@ -41,6 +41,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_keystone/tasks/keystone_install.yml b/playbooks/roles/os_keystone/tasks/keystone_install.yml index 21ff7a0e22..bacad8e2ff 100644 --- a/playbooks/roles/os_keystone/tasks/keystone_install.yml +++ b/playbooks/roles/os_keystone/tasks/keystone_install.yml @@ -66,6 +66,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_neutron/tasks/neutron_install.yml b/playbooks/roles/os_neutron/tasks/neutron_install.yml index 760899b28d..79f18c7159 100644 --- a/playbooks/roles/os_neutron/tasks/neutron_install.yml +++ b/playbooks/roles/os_neutron/tasks/neutron_install.yml @@ -52,6 +52,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_nova/tasks/nova_install.yml b/playbooks/roles/os_nova/tasks/nova_install.yml index 8ad6d93689..ad7f2fcb35 100644 --- a/playbooks/roles/os_nova/tasks/nova_install.yml +++ b/playbooks/roles/os_nova/tasks/nova_install.yml @@ -40,6 +40,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_swift/tasks/swift_install.yml b/playbooks/roles/os_swift/tasks/swift_install.yml index 189bb04af7..ed2cc34bc9 100644 --- a/playbooks/roles/os_swift/tasks/swift_install.yml +++ b/playbooks/roles/os_swift/tasks/swift_install.yml @@ -41,6 +41,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/os_tempest/tasks/tempest_install.yml b/playbooks/roles/os_tempest/tasks/tempest_install.yml index c0dd9b823d..5fb5a59dd7 100644 --- a/playbooks/roles/os_tempest/tasks/tempest_install.yml +++ b/playbooks/roles/os_tempest/tasks/tempest_install.yml @@ -17,6 +17,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/py_from_git/tasks/main.yml b/playbooks/roles/py_from_git/tasks/main.yml index b296897962..c459071491 100644 --- a/playbooks/roles/py_from_git/tasks/main.yml +++ b/playbooks/roles/py_from_git/tasks/main.yml @@ -29,6 +29,7 @@ pip: name: "{{ git_dest }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/rabbitmq_server/tasks/rabbitmq_install.yml b/playbooks/roles/rabbitmq_server/tasks/rabbitmq_install.yml index e39d83f266..78c97bccab 100644 --- a/playbooks/roles/rabbitmq_server/tasks/rabbitmq_install.yml +++ b/playbooks/roles/rabbitmq_server/tasks/rabbitmq_install.yml @@ -49,6 +49,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/roles/repo_server/tasks/repo_install.yml b/playbooks/roles/repo_server/tasks/repo_install.yml index 7885b6d2db..33dd72b9b4 100644 --- a/playbooks/roles/repo_server/tasks/repo_install.yml +++ b/playbooks/roles/repo_server/tasks/repo_install.yml @@ -40,6 +40,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5 diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index aabbd41a56..45240d55b1 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -90,6 +90,7 @@ pip: name: "{{ item }}" state: present + extra_args: "{{ pip_install_options|default('') }}" register: install_packages until: install_packages|success retries: 5