Remove octavia_requires_pip_packages
In order to reduce the packages required to pip install on to the hosts, we use service delegation to octavia_service_setup_host so that instead of installing software on the target host, and putting credentials on every target host, we isolate the software and credentials to a single host. In this patch we finally remove octavia_requires_pip_packages as it is no longer required given that all services use delegation to the octavia_service_setup_host now. We also remove the task which used to install them. We also remove the meta dependency on the openstack_openrc role because the target host does not require openrc/clouds.yaml any more. We remove the variable 'octavia_ansible_endpoint_type' as it is no longer used. We finally remove the python-pip package from the distro packages, as with these changes, pip is no longer required on the host - everything installed by pip is isolated into a venv. Change-Id: If3f65fdb8a59a3c41cb8c2f0dee6b2e5a71f05c7
This commit is contained in:
parent
bd9f0c0723
commit
14d5186079
@ -112,7 +112,6 @@ octavia_service_project_domain_id: default
|
|||||||
octavia_service_user_domain_id: default
|
octavia_service_user_domain_id: default
|
||||||
octavia_keystone_auth_plugin: "{{ octavia_keystone_auth_type }}"
|
octavia_keystone_auth_plugin: "{{ octavia_keystone_auth_type }}"
|
||||||
octavia_keystone_auth_type: password
|
octavia_keystone_auth_type: password
|
||||||
octavia_ansible_endpoint_type: "internal" # endpoint for ansible
|
|
||||||
|
|
||||||
## octavia api service type and data
|
## octavia api service type and data
|
||||||
octavia_service_name: octavia
|
octavia_service_name: octavia
|
||||||
@ -138,14 +137,6 @@ octavia_plugin_dirs:
|
|||||||
- /usr/lib/octavia
|
- /usr/lib/octavia
|
||||||
- /usr/local/lib/octavia
|
- /usr/local/lib/octavia
|
||||||
|
|
||||||
# octavia packages that must be installed before anything else
|
|
||||||
octavia_requires_pip_packages:
|
|
||||||
- httplib2
|
|
||||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
|
||||||
- shade
|
|
||||||
- virtualenv
|
|
||||||
- python-openstackclient
|
|
||||||
|
|
||||||
# Common pip packages
|
# Common pip packages
|
||||||
octavia_pip_packages:
|
octavia_pip_packages:
|
||||||
- cryptography
|
- cryptography
|
||||||
|
@ -34,4 +34,3 @@ dependencies:
|
|||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
- galera_client
|
- galera_client
|
||||||
- openstack_openrc
|
|
||||||
|
@ -12,7 +12,14 @@ features:
|
|||||||
octavia_service_setup_host: "{{ groups['utility_all'][0] }}"
|
octavia_service_setup_host: "{{ groups['utility_all'][0] }}"
|
||||||
|
|
||||||
deprecations:
|
deprecations:
|
||||||
|
- |
|
||||||
|
The variable ``octavia_requires_pip_packages`` is no longer required
|
||||||
|
and has therefore been removed.
|
||||||
- |
|
- |
|
||||||
The variable ``octavia_image_downloader`` has been removed. The image
|
The variable ``octavia_image_downloader`` has been removed. The image
|
||||||
download now uses the same host designated by the
|
download now uses the same host designated by the
|
||||||
``octavia_service_setup_host`` for the image download.
|
``octavia_service_setup_host`` for the image download.
|
||||||
|
- |
|
||||||
|
The variable ``octavia_ansible_endpoint_type`` has been removed. The
|
||||||
|
endpoint used for ansible tasks has been hard set to the 'admin'
|
||||||
|
endpoint as is commonly used across all OSA roles.
|
||||||
|
@ -33,19 +33,6 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
when: octavia_developer_mode | bool
|
when: octavia_developer_mode | bool
|
||||||
|
|
||||||
- name: Install required pip packages
|
|
||||||
pip:
|
|
||||||
name: "{{ octavia_requires_pip_packages }}"
|
|
||||||
state: "{{ octavia_pip_package_state }}"
|
|
||||||
extra_args: >-
|
|
||||||
{{ octavia_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
|
|
||||||
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
|
|
||||||
{{ pip_install_options | default('') }}
|
|
||||||
register: install_packages
|
|
||||||
until: install_packages is success
|
|
||||||
retries: 5
|
|
||||||
delay: 2
|
|
||||||
|
|
||||||
- name: Retrieve checksum for venv download
|
- name: Retrieve checksum for venv download
|
||||||
uri:
|
uri:
|
||||||
url: "{{ octavia_venv_download_url | replace('tgz', 'checksum') }}"
|
url: "{{ octavia_venv_download_url | replace('tgz', 'checksum') }}"
|
||||||
|
@ -21,4 +21,3 @@ octavia_distro_packages:
|
|||||||
- iptables-persistent
|
- iptables-persistent
|
||||||
- libxml2-dev
|
- libxml2-dev
|
||||||
- netfilter-persistent
|
- netfilter-persistent
|
||||||
- python-pip
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user