From 87304fb8278aa0b4777f86be9664047511c1efe1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 18 Jul 2019 16:28:33 +0300 Subject: [PATCH] service_setup: refactor service setup to a single file This patch refactors the openstack user/service/endpoints creation to service_setup.yml which will eventually be managed by openstack-ansible-tests. service_setup: refactor service setup to a single file This patch refactors the openstack user/service/endpoints creation to service_setup.yml which will eventually be managed by openstack-ansible-tests. Change-Id: Ibeb38f022174dc5b2ee449b7f5303bbc194fb238 --- tasks/main.yml | 33 +++++++- tasks/service_setup.yml | 144 ++++++++++++++++++++++++++++++++++ tasks/swift_service_setup.yml | 126 ----------------------------- 3 files changed, 176 insertions(+), 127 deletions(-) create mode 100644 tasks/service_setup.yml delete mode 100644 tasks/swift_service_setup.yml diff --git a/tasks/main.yml b/tasks/main.yml index 08f2c7d3..26bec3f0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -148,7 +148,38 @@ - common-mq - swift-config -- import_tasks: swift_service_setup.yml +- import_tasks: service_setup.yml + vars: + _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}" + _service_in_ldap: "{{ swift_service_in_ldap }}" + _service_setup_host: "{{ swift_service_setup_host }}" + _service_setup_host_python_interpreter: "{{ swift_service_setup_host_python_interpreter }}" + _service_project_name: "{{ swift_service_project_name }}" + _service_users: + - name: "{{ swift_service_user_name }}" + password: "{{ swift_service_password }}" + role: "{{ swift_service_role_name }}" + - name: "{{ swift_dispersion_user }}" + password: "{{ swift_dispersion_password }}" + role: "{{ swift_operator_role }}" + - name: "{{ ceilometer_service_user_name | default('ceilometer') }}" + role: "{{ swift_reselleradmin_role }}" + project: "{{ ceilometer_service_project_name | default('service') }}" + condition: "{{ swift_ceilometer_enabled | bool }}" + _service_endpoints: + - service: "{{ swift_service_name }}" + interface: "public" + url: "{{ swift_service_publicurl }}" + - service: "{{ swift_service_name }}" + interface: "internal" + url: "{{ swift_service_internalurl }}" + - service: "{{ swift_service_name }}" + interface: "admin" + url: "{{ swift_service_adminurl }}" + _service_catalog: + - name: "{{ swift_service_name }}" + type: "{{ swift_service_type }}" + description: "{{ swift_service_description }}" when: - "swift_do_setup | bool" - '"keystoneauth" in swift_middleware_list' diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml new file mode 100644 index 00000000..d43d14e9 --- /dev/null +++ b/tasks/service_setup.yml @@ -0,0 +1,144 @@ +--- +# Copyright 2019, VEXXHOST, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# WARNING: +# This file is maintained in the openstack-ansible-tests repository. +# https://opendev.org/openstack/openstack-ansible-tests/src/sync/tasks/service_setup.yml +# If you need to modify this file, update the one in the openstack-ansible-tests +# repository. Once it merges there, the changes will automatically be proposed to +# all the repositories which use it. + +# 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 OS service + delegate_to: "{{ _service_setup_host }}" + vars: + ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}" + block: + - name: Add service project + os_project: + cloud: default + state: present + name: "{{ _project_name }}" + description: "{{ _project_description | default('') }}" + domain_id: "default" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + when: + - not (_service_in_ldap | default(False) | bool) + - _project_name is defined + until: add_service is success + retries: 5 + delay: 10 + + - name: Add services to the keystone service catalog + os_keystone_service: + cloud: default + state: "{{ item.state | default('present') }}" + name: "{{ item.name }}" + service_type: "{{ item.type }}" + description: "{{ item.description | default('') }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + with_items: "{{ _service_catalog }}" + when: _service_catalog is defined + until: add_service is success + retries: 5 + delay: 10 + + - name: Add keystone roles + os_keystone_role: + cloud: default + state: present + name: "{{ item.role }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + when: + - not (_service_in_ldap | default(False) | bool) + - _service_users is defined + - "'role' in item" + - (item.condition | default(True)) | bool + until: add_service is success + with_items: "{{ _service_users }}" + retries: 5 + delay: 10 + + - name: Add service users + os_user: + cloud: default + state: present + name: "{{ item.name }}" + password: "{{ item.password }}" + domain: default + default_project: "{{ item.project | default(_service_project_name) }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + when: + - not (_service_in_ldap | default(False) | bool) + - _service_users is defined + - "'name' in item" + - "'password' in item" + - (item.condition | default(True)) | bool + until: add_service is success + with_items: "{{ _service_users }}" + retries: 5 + delay: 10 + no_log: True + + - name: Add service users to the role + os_user_role: + cloud: default + state: present + user: "{{ item.name }}" + role: "{{ item.role }}" + project: "{{ item.project | default(_service_project_name) }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + when: + - not (_service_in_ldap | default(False) | bool) + - _service_users is defined + - "'name' in item" + - "'role' in item" + - (item.condition | default(True)) | bool + until: add_service is success + with_items: "{{ _service_users }}" + retries: 5 + delay: 10 + + - name: Add endpoints to keystone endpoint catalog + os_keystone_endpoint: + cloud: default + state: "{{ item.state | default('present') }}" + service: "{{ item.service }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ _service_region | default('RegionOne') }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 + with_items: "{{ _service_endpoints }}" + when: _service_endpoints is defined diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml deleted file mode 100644 index b72be433..00000000 --- a/tasks/swift_service_setup.yml +++ /dev/null @@ -1,126 +0,0 @@ ---- -# Copyright 2014, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# 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: "{{ swift_service_setup_host }}" - vars: - ansible_python_interpreter: "{{ swift_service_setup_host_python_interpreter }}" - block: - - name: Add service to the keystone service catalog - os_keystone_service: - cloud: default - state: present - name: "{{ swift_service_name }}" - service_type: "{{ swift_service_type }}" - description: "{{ swift_service_description }}" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - - - name: Add service users - os_user: - cloud: default - state: present - name: "{{ item.name }}" - password: "{{ item.password }}" - domain: default - default_project: "{{ swift_service_project_name }}" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - when: not swift_service_in_ldap | bool - until: add_service is success - retries: 5 - delay: 10 - no_log: True - with_items: - - name: "{{ swift_service_user_name }}" - password: "{{ swift_service_password }}" - - name: "{{ swift_dispersion_user }}" - password: "{{ swift_dispersion_password }}" - loop_control: - label: "{{ item.name }}" - - - name: Add service roles - os_keystone_role: - cloud: default - state: present - name: "{{ item }}" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - when: not swift_service_in_ldap | bool - until: add_service is success - retries: 5 - delay: 10 - with_items: - - "{{ swift_operator_role }}" - - "{{ swift_reselleradmin_role }}" - - - name: Add service users to roles - os_user_role: - cloud: default - state: present - user: "{{ item.name }}" - role: "{{ item.role }}" - project: "{{ item.project | default(swift_service_project_name) }}" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - when: - - not swift_service_in_ldap | bool - - (item.condition | default(True)) | bool - until: add_service is success - retries: 5 - delay: 10 - with_items: - - name: "{{ swift_service_user_name }}" - role: "{{ swift_service_role_name }}" - - name: "{{ swift_dispersion_user }}" - role: "{{ swift_operator_role }}" - - name: "{{ ceilometer_service_user_name | default('ceilometer') }}" - role: "{{ swift_reselleradmin_role }}" - project: "{{ ceilometer_service_project_name | default('service') }}" - condition: "{{ swift_ceilometer_enabled | bool }}" - - - name: Add endpoints to keystone endpoint catalog - os_keystone_endpoint: - cloud: default - state: present - service: "{{ swift_service_name }}" - endpoint_interface: "{{ item.interface }}" - url: "{{ item.url }}" - region: "{{ swift_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: "{{ swift_service_publicurl }}" - - interface: "internal" - url: "{{ swift_service_internalurl }}" - - interface: "admin" - url: "{{ swift_service_adminurl }}"