From 99de75a151dcd403780bdce276a0bbc78831a117 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 30 Jul 2019 17:40:50 +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. Change-Id: I61fe5fe2f13f924a55e477c3496168550b76ba05 --- tasks/cloudkitty_service_setup.yml | 107 ------------------- tasks/main.yml | 28 ++++- tasks/service_setup.yml | 159 +++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 108 deletions(-) delete mode 100644 tasks/cloudkitty_service_setup.yml create mode 100644 tasks/service_setup.yml diff --git a/tasks/cloudkitty_service_setup.yml b/tasks/cloudkitty_service_setup.yml deleted file mode 100644 index 3eff379..0000000 --- a/tasks/cloudkitty_service_setup.yml +++ /dev/null @@ -1,107 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# (C) 2016 Michael Rice -# -# 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: "{{ cloudkitty_service_setup_host }}" - vars: - ansible_python_interpreter: "{{ cloudkitty_service_setup_host_python_interpreter }}" - block: - - name: Add service to the keystone service catalog - os_keystone_service: - cloud: default - state: present - name: "{{ cloudkitty_service_name }}" - service_type: "rating" - description: "OpenStack Rating Service" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - - - name: Add rating role - os_keystone_role: - cloud: default - state: present - name: "rating" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - - - name: Add service user - os_user: - cloud: default - state: present - name: "{{ cloudkitty_service_user_name }}" - password: "{{ cloudkitty_service_password }}" - domain: default - default_project: "{{ cloudkitty_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: Add service user to roles - os_user_role: - cloud: default - state: present - user: "{{ cloudkitty_service_user_name }}" - role: "{{ item }}" - project: "{{ cloudkitty_service_project_name }}" - endpoint_type: admin - verify: "{{ not keystone_service_adminuri_insecure }}" - with_items: - - "admin" - - "rating" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - - - name: Add endpoints to keystone endpoint catalog - os_keystone_endpoint: - cloud: default - state: present - service: "{{ cloudkitty_service_name }}" - endpoint_interface: "{{ item.interface }}" - url: "{{ item.url }}" - region: "{{ cloudkitty_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: "{{ cloudkitty_service_publicurl }}" - - interface: "internal" - url: "{{ cloudkitty_service_internalurl }}" - - interface: "admin" - url: "{{ cloudkitty_service_adminurl }}" diff --git a/tasks/main.yml b/tasks/main.yml index 5c2acc4..97386d9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -100,7 +100,33 @@ tags: - cloudkitty-config -- import_tasks: cloudkitty_service_setup.yml +- include_tasks: service_setup.yml + vars: + _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}" + _service_setup_host: "{{ cloudkitty_service_setup_host }}" + _service_setup_host_python_interpreter: "{{ cloudkitty_service_setup_host_python_interpreter }}" + _service_project_name: "{{ cloudkitty_service_project_name }}" + _service_region: "{{ cloudkitty_service_region }}" + _service_users: + - name: "{{ cloudkitty_service_user_name }}" + password: "{{ cloudkitty_service_password }}" + role: "rating" + - name: "{{ cloudkitty_service_user_name }}" + role: admin + _service_endpoints: + - service: "{{ cloudkitty_service_name }}" + interface: "public" + url: "{{ cloudkitty_service_publicurl }}" + - service: "{{ cloudkitty_service_name }}" + interface: "internal" + url: "{{ cloudkitty_service_internalurl }}" + - service: "{{ cloudkitty_service_name }}" + interface: "admin" + url: "{{ cloudkitty_service_adminurl }}" + _service_catalog: + - name: "{{ cloudkitty_service_name }}" + type: "rating" + description: "OpenStack Rating Service" when: inventory_hostname == groups['cloudkitty_all'][0] tags: - cloudkitty-config diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml new file mode 100644 index 0000000..0ff5465 --- /dev/null +++ b/tasks/service_setup.yml @@ -0,0 +1,159 @@ +--- +# 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 keystone domain + os_keystone_domain: + cloud: default + state: present + name: "{{ _domain_name }}" + endpoint_type: admin + verify: "{{ not _service_adminuri_insecure }}" + register: add_domain + when: _domain_name is defined + until: add_domain is success + retries: 5 + delay: 10 + + - name: Add service project + os_project: + cloud: default + state: present + name: "{{ _project_name }}" + description: "{{ _project_description | default(omit) }}" + domain_id: "{{ _project_domain | default('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: "{{ item.domain | default('default') }}" + default_project: "{{ item.project | default(_service_project_name) }}" + endpoint_type: admin + validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" + update_password: always + 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) }}" + domain: "{{ item.domain | default(omit) }}" + 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