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. Depends-On: https://review.openstack.org/579233 Depends-On: https://review.openstack.org/579959 Change-Id: I20186fd3bb4a3fade91e14f6360232454de9c989
This commit is contained in:
parent
b12fe46841
commit
9d01669487
|
@ -16,6 +16,11 @@
|
|||
## Verbosity Options
|
||||
debug: False
|
||||
|
||||
# Set the host which will execute the shade modules
|
||||
# for the service setup. The host must already have
|
||||
# clouds.yaml properly configured.
|
||||
barbican_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
|
||||
|
||||
# Set the package install state for distribution and pip packages
|
||||
# Options are 'present' and 'latest'
|
||||
barbican_package_state: "latest"
|
||||
|
@ -132,11 +137,6 @@ barbican_ssl_self_signed_subject: "/C=US/ST=Texas/L=San Antonio/O=IT/CN={{ inter
|
|||
#barbican_user_ssl_key: <path to cert on ansible deployment host>
|
||||
#barbican_user_ssl_ca_cert: <path to cert on ansible deployment host>
|
||||
|
||||
# packages required to execute the role
|
||||
barbican_requires_pip_packages:
|
||||
- virtualenv
|
||||
- python-keystoneclient # Keystoneclient needed by OSA keystone lib
|
||||
|
||||
# packages required to run the barbican service
|
||||
barbican_pip_packages:
|
||||
- barbican
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The service setup in keystone for barbican will now be executed
|
||||
through delegation to the ``barbican_service_setup_host`` which,
|
||||
by default, is ``localhost`` (the deploy host). Deployers can
|
||||
opt to rather change this to the utility container by implementing
|
||||
the following override in ``user_variables.yml``.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
barbican_service_setup_host: "{{ groups['utility_all'][0] }}"
|
||||
|
||||
deprecations:
|
||||
- |
|
||||
The variable ``barbican_requires_pip_packages`` is no longer required
|
||||
and has therefore been removed.
|
|
@ -22,19 +22,6 @@
|
|||
{% endfor %}
|
||||
when: barbican_developer_mode | bool
|
||||
|
||||
- name: Install requires pip packages
|
||||
pip:
|
||||
name: "{{ barbican_requires_pip_packages }}"
|
||||
state: "{{ barbican_pip_package_state }}"
|
||||
extra_args: >-
|
||||
{{ barbican_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|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Retrieve checksum for venv download
|
||||
uri:
|
||||
url: "{{ barbican_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
|
|
|
@ -13,78 +13,80 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Ensure the service for Barbican exists
|
||||
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 }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
service_name: "{{ barbican_service_name }}"
|
||||
service_type: "{{ barbican_service_type }}"
|
||||
description: "{{ barbican_service_description }}"
|
||||
register: add_barbican_service
|
||||
until: add_barbican_service |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: "{{ barbican_service_setup_host }}"
|
||||
vars:
|
||||
ansible_python_interpreter: >-
|
||||
{{ (barbican_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: "{{ barbican_service_name }}"
|
||||
service_type: "{{ barbican_service_type }}"
|
||||
description: "{{ barbican_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 the Barbican user exists
|
||||
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 }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
user_name: "{{ barbican_service_user_name }}"
|
||||
tenant_name: "{{ barbican_service_project_name }}"
|
||||
password: "{{ barbican_service_password |default('changeme') }}"
|
||||
register: add_barbican_user
|
||||
until: add_barbican_user |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
no_log: True
|
||||
- name: Add service user
|
||||
os_user:
|
||||
cloud: default
|
||||
state: present
|
||||
name: "{{ barbican_service_user_name }}"
|
||||
password: "{{ barbican_service_password }}"
|
||||
domain: default
|
||||
default_project: "{{ barbican_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
until: add_service is success
|
||||
retries: 5
|
||||
delay: 10
|
||||
no_log: True
|
||||
|
||||
- name: Ensure the Barbican user has the 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: "{{ barbican_service_user_name }}"
|
||||
tenant_name: "{{ barbican_service_project_name }}"
|
||||
role_name: "{{ item }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
register: ensure_barbican_roles
|
||||
until: ensure_barbican_roles |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ barbican_service_role_names }}"
|
||||
no_log: True
|
||||
- name: Add service user to admin roles
|
||||
os_user_role:
|
||||
cloud: default
|
||||
state: present
|
||||
user: "{{ barbican_service_user_name }}"
|
||||
role: "{{ item }}"
|
||||
project: "{{ barbican_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
with_items: "{{ barbican_service_role_names }}"
|
||||
register: add_service
|
||||
until: add_service is success
|
||||
retries: 5
|
||||
delay: 10
|
||||
|
||||
- name: Ensure the Barbican endpoint is registered
|
||||
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 }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
region_name: "{{ barbican_service_region }}"
|
||||
service_name: "{{ barbican_service_name }}"
|
||||
service_type: "{{ barbican_service_type }}"
|
||||
endpoint_list:
|
||||
- url: "{{ barbican_service_publicurl }}"
|
||||
interface: "public"
|
||||
- url: "{{ barbican_service_internalurl }}"
|
||||
interface: "internal"
|
||||
- url: "{{ barbican_service_adminurl }}"
|
||||
interface: "admin"
|
||||
register: add_barbican_endpoints
|
||||
until: add_barbican_endpoints |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
no_log: True
|
||||
- name: Add endpoints to keystone endpoint catalog
|
||||
os_keystone_endpoint:
|
||||
cloud: default
|
||||
state: present
|
||||
service: "{{ barbican_service_name }}"
|
||||
endpoint_interface: "{{ item.interface }}"
|
||||
url: "{{ item.url }}"
|
||||
region: "{{ barbican_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: "{{ barbican_service_publicurl }}"
|
||||
- interface: "internal"
|
||||
url: "{{ barbican_service_internalurl }}"
|
||||
- interface: "admin"
|
||||
url: "{{ barbican_service_adminurl }}"
|
||||
|
|
|
@ -15,5 +15,3 @@
|
|||
|
||||
bridges:
|
||||
- "br-mgmt"
|
||||
|
||||
ansible_python_interpreter: "/usr/bin/python2"
|
||||
|
|
Loading…
Reference in New Issue