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.

With the dependent patches, the openstack_openrc role is now executed once
on the designated host, so it is no longer required as a meta-dependency for
the role.

Change-Id: Ib41f12b837f73ea534c6a0f926a70f7a82d7a194
This commit is contained in:
Jesse Pretorius 2018-07-17 10:34:02 +01:00
parent 8d8411196e
commit c7bc980de3
6 changed files with 82 additions and 102 deletions

View File

@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Set the host which will execute the shade modules
# for the service setup. The host must already have
# clouds.yaml properly configured.
blazar_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
blazar_package_state: latest
blazar_pip_package_state: latest
@ -30,13 +35,6 @@ blazar_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/blazar.tgz
blazar_etc_dir: /etc/blazar
blazar_config_option: "--config-file {{ blazar_etc_dir }}/blazar.conf"
## Required PIP packages
blazar_requires_pip_packages:
- tox
- virtualenv
- virtualenv-tools
- python-keystoneclient
## Common PIP requirements
blazar_pip_packages:
- blazar

View File

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

View File

@ -34,19 +34,6 @@
{% endfor %}
when: blazar_developer_mode | bool
- name: Install required pip packages
pip:
name: "{{ blazar_requires_pip_packages }}"
state: "{{ blazar_pip_package_state }}"
extra_args: >-
{{ blazar_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
uri:
url: "{{ blazar_venv_download_url | replace('tgz', 'checksum') }}"
@ -122,4 +109,4 @@
dest: "/etc/ansible/facts.d/openstack_ansible.fact"
section: blazar
option: venv_tag
value: "{{ blazar_venv_tag }}"
value: "{{ blazar_venv_tag }}"

View File

@ -14,84 +14,82 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Ensure blazar service
keystone:
command: "ensure_service"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
service_name: "{{ blazar_service_name }}"
service_type: "{{ blazar_service_type }}"
description: "{{ blazar_service_description }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service is success
retries: 5
delay: 2
no_log: true
# We set the python interpreter to the ansible runtime venv if
# the delegation is to localhost so that we get access to the
# appropriate python libraries in that venv. If the delegation
# is to another host, we assume that it is accessible by the
# system python instead.
- name: Setup the service
delegate_to: "{{ blazar_service_setup_host }}"
vars:
ansible_python_interpreter: >-
{{ (blazar_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
block:
- name: Add service to the keystone service catalog
os_keystone_service:
cloud: default
state: present
name: "{{ blazar_service_name }}"
service_type: "{{ blazar_service_type }}"
description: "{{ blazar_service_description }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
until: add_service is success
retries: 5
delay: 10
# Create an admin user
- name: Ensure blazar user
keystone:
command: "ensure_user"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
user_name: "{{ blazar_service_user_name }}"
tenant_name: "{{ blazar_service_project_name }}"
password: "{{ blazar_service_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not blazar_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
no_log: true
- name: Add service user
os_user:
cloud: default
state: present
name: "{{ blazar_service_user_name }}"
password: "{{ blazar_service_password }}"
domain: default
default_project: "{{ blazar_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
when: not blazar_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
no_log: True
# Add role to the user
- name: Ensure blazar user to admin role
keystone:
command: "ensure_user_role"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
user_name: "{{ blazar_service_user_name }}"
tenant_name: "{{ blazar_service_project_name }}"
role_name: "{{ blazar_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not blazar_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
no_log: true
- name: Add service user to admin role
os_user_role:
cloud: default
state: present
user: "{{ blazar_service_user_name }}"
role: "{{ blazar_role_name }}"
project: "{{ blazar_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
when: not blazar_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
- name: Add endpoints to keystone endpoint catalog
os_keystone_endpoint:
cloud: default
state: present
service: "{{ blazar_service_name }}"
endpoint_interface: "{{ item.interface }}"
url: "{{ item.url }}"
region: "{{ blazar_service_region }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
until: add_service is success
retries: 5
delay: 10
with_items:
- interface: "public"
url: "{{ blazar_service_publicurl }}"
- interface: "internal"
url: "{{ blazar_service_internalurl }}"
- interface: "admin"
url: "{{ blazar_service_adminurl }}"
# Create an endpoint
- name: Ensure blazar endpoint
keystone:
command: "ensure_endpoint"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
region_name: "{{ blazar_service_region }}"
service_name: "{{ blazar_service_name }}"
service_type: "{{ blazar_service_type }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
endpoint_list:
- url: "{{ blazar_service_publicurl }}"
interface: "public"
- url: "{{ blazar_service_internalurl }}"
interface: "internal"
- url: "{{ blazar_service_adminurl }}"
interface: "admin"
register: add_service
until: add_service is success
retries: 5
delay: 10
tags:
- blazar-setup
no_log: true

View File

@ -16,7 +16,6 @@
ansible_connection: local
ansible_host: 10.1.1.1
neutron_local_ip: 10.1.2.1
ansible_python_interpreter: "/usr/bin/python2"
bridges:
- name: "br-mgmt"
ip_addr: "10.1.1.1"

View File

@ -16,7 +16,6 @@
- name: Playbook for deploying blazar
hosts: blazar_all
user: root
become: true
gather_facts: true
any_errors_fatal: true
pre_tasks: