Execute service setup against a delegated host using Ansible built-in modules

In order to reduce the packages required to pip install on to the hosts,
we allow the service setup to be delegated to a specific host, defaulting
to the deploy host. We also switch as many tasks as possible to using the
built-in Ansible modules which make use of the shade library.

The 'virtualenv' package is now installed appropriately by the openstack_hosts
role, so there's no need to install it any more. The 'httplib2' package is a
legacy Ansible requirement for the get_url/get_uri module which is no longer
needed. The keystone client library is not required any more now that we're
using the upstream modules. As there are no required packages left, the task
to install them is also removed.

Change-Id: I4279311e1022d8625503b41e69573e680fbb742a
This commit is contained in:
Jesse Pretorius 2018-07-12 19:18:10 +01:00
parent 2347e727b6
commit c7dfd59acf
6 changed files with 82 additions and 99 deletions

View File

@ -14,6 +14,11 @@
## Verbosity Options ## Verbosity Options
debug: False debug: False
# Set the host which will execute the shade modules
# for the service setup. The host must already have
# clouds.yaml properly configured.
panko_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
# Set the package install state for distribution and pip packages # Set the package install state for distribution and pip packages
# Options are 'present' and 'latest' # Options are 'present' and 'latest'
panko_package_state: "latest" panko_package_state: "latest"
@ -91,12 +96,6 @@ panko_service_adminurl: "{{ panko_service_adminuri }}"
panko_service_in_ldap: false panko_service_in_ldap: false
# panko packages that must be installed before anything else
panko_requires_pip_packages:
- virtualenv
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2
# Common pip packages # Common pip packages
panko_pip_packages: panko_pip_packages:
- alembic>=0.7.2 - alembic>=0.7.2

View File

@ -36,4 +36,3 @@ dependencies:
when: when:
- ansible_pkg_mgr == 'apt' - ansible_pkg_mgr == 'apt'
- galera_client - galera_client
- openstack_openrc

View File

@ -47,19 +47,6 @@
{% endfor %} {% endfor %}
when: panko_developer_mode | bool when: panko_developer_mode | bool
- name: Install requires pip packages
pip:
name: "{{ panko_requires_pip_packages }}"
state: "{{ panko_pip_package_state }}"
extra_args: >-
{{ panko_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: "{{ panko_venv_download_url | replace('tgz', 'checksum') }}" url: "{{ panko_venv_download_url | replace('tgz', 'checksum') }}"

View File

@ -13,81 +13,81 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Ensure panko service # We set the python interpreter to the ansible runtime venv if
keystone: # the delegation is to localhost so that we get access to the
command: "ensure_service" # appropriate python libraries in that venv. If the delegation
endpoint: "{{ keystone_service_adminurl }}" # is to another host, we assume that it is accessible by the
login_user: "{{ keystone_admin_user_name }}" # system python instead.
login_password: "{{ keystone_auth_admin_password }}" - name: Setup the service
login_project_name: "{{ keystone_admin_tenant_name }}" delegate_to: "{{ panko_service_setup_host }}"
service_name: "{{ panko_service_name }}" vars:
service_type: "{{ panko_service_type }}" ansible_python_interpreter: >-
description: "{{ panko_service_description }}" {{ (panko_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
insecure: "{{ keystone_service_adminuri_insecure }}" block:
register: add_service - name: Add service to the keystone service catalog
until: add_service is success os_keystone_service:
retries: 5 cloud: default
delay: 2 state: present
no_log: True name: "{{ panko_service_name }}"
service_type: "{{ panko_service_type }}"
description: "{{ panko_service_description }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
until: add_service is success
retries: 5
delay: 10
- name: Ensure panko user - name: Add service user
keystone: os_user:
command: "ensure_user" cloud: default
endpoint: "{{ keystone_service_adminurl }}" state: present
login_user: "{{ keystone_admin_user_name }}" name: "{{ panko_service_user_name }}"
login_password: "{{ keystone_auth_admin_password }}" password: "{{ panko_service_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}" domain: default
user_name: "{{ panko_service_user_name }}" default_project: "{{ panko_service_tenant_name }}"
tenant_name: "{{ panko_service_tenant_name }}" endpoint_type: admin
role_name: "{{ panko_role_name }}" verify: "{{ not keystone_service_adminuri_insecure }}"
password: "{{ panko_service_password }}" register: add_service
insecure: "{{ keystone_service_adminuri_insecure }}" when: not panko_service_in_ldap | bool
register: add_service until: add_service is success
when: not panko_service_in_ldap | bool retries: 5
until: add_service is success delay: 10
retries: 5 no_log: True
delay: 10
no_log: True
- name: Ensure panko user to admin role - name: Add service user to admin role
keystone: os_user_role:
command: "ensure_user_role" cloud: default
endpoint: "{{ keystone_service_adminurl }}" state: present
login_user: "{{ keystone_admin_user_name }}" user: "{{ panko_service_user_name }}"
login_password: "{{ keystone_auth_admin_password }}" role: "{{ panko_role_name }}"
login_project_name: "{{ keystone_admin_tenant_name }}" project: "{{ panko_service_project_name }}"
user_name: "{{ panko_service_user_name }}" endpoint_type: admin
tenant_name: "{{ panko_service_project_name }}" verify: "{{ not keystone_service_adminuri_insecure }}"
role_name: "{{ panko_role_name }}" register: add_service
insecure: "{{ keystone_service_adminuri_insecure }}" when: not panko_service_in_ldap | bool
register: add_admin_role until: add_service is success
when: not panko_service_in_ldap | bool retries: 5
until: add_admin_role is success delay: 10
retries: 5
delay: 10
no_log: True
# Create an endpoint - name: Add endpoints to keystone endpoint catalog
- name: Ensure panko endpoint os_keystone_endpoint:
keystone: cloud: default
command: "ensure_endpoint" state: present
endpoint: "{{ keystone_service_adminurl }}" service: "{{ panko_service_name }}"
login_user: "{{ keystone_admin_user_name }}" endpoint_interface: "{{ item.interface }}"
login_password: "{{ keystone_auth_admin_password }}" url: "{{ item.url }}"
login_project_name: "{{ keystone_admin_tenant_name }}" region: "{{ panko_service_region }}"
region_name: "{{ panko_service_region }}" endpoint_type: admin
service_name: "{{ panko_service_name }}" verify: "{{ not keystone_service_adminuri_insecure }}"
service_type: "{{ panko_service_type }}" register: add_service
insecure: "{{ keystone_service_adminuri_insecure }}" until: add_service is success
endpoint_list: retries: 5
- url: "{{ panko_service_publicurl }}" delay: 10
interface: "public" with_items:
- url: "{{ panko_service_adminurl }}" - interface: "public"
interface: "admin" url: "{{ panko_service_publicurl }}"
- url: "{{ panko_service_internalurl }}" - interface: "internal"
interface: "internal" url: "{{ panko_service_internalurl }}"
register: add_service - interface: "admin"
until: add_service is success url: "{{ panko_service_adminurl }}"
retries: 5
delay: 10
no_log: True

View File

@ -15,5 +15,3 @@
bridges: bridges:
- "br-mgmt" - "br-mgmt"
ansible_python_interpreter: "/usr/bin/python2"

View File

@ -17,7 +17,7 @@
hosts: panko_all hosts: panko_all
user: root user: root
gather_facts: true gather_facts: true
roles:
- role: "{{ panko_rolename | default('os_panko') }}"
vars_files: vars_files:
- common/test-vars.yml - common/test-vars.yml
roles:
- role: "os_panko"