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: I5c2d63b5da6e2b4adf629ca8b08b5d6904c225ca
This commit is contained in:
Dmitriy Rabotjagov
Dmitriy Rabotyagov
parent
36adc844da
commit
d1e21c2085
@ -161,7 +161,31 @@
|
||||
tags:
|
||||
- neutron-config
|
||||
|
||||
- import_tasks: neutron_service_setup.yml
|
||||
- import_tasks: service_setup.yml
|
||||
vars:
|
||||
_service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
_service_in_ldap: "{{ neutron_service_in_ldap }}"
|
||||
_service_setup_host: "{{ neutron_service_setup_host }}"
|
||||
_service_setup_host_python_interpreter: "{{ neutron_service_setup_host_python_interpreter }}"
|
||||
_service_project_name: "{{ neutron_service_project_name }}"
|
||||
_service_users:
|
||||
- name: "{{ neutron_service_user_name }}"
|
||||
password: "{{ neutron_service_password }}"
|
||||
role: "{{ neutron_service_role_name }}"
|
||||
_service_endpoints:
|
||||
- service: "{{ neutron_service_name }}"
|
||||
interface: "public"
|
||||
url: "{{ neutron_service_publicurl }}"
|
||||
- service: "{{ neutron_service_name }}"
|
||||
interface: "internal"
|
||||
url: "{{ neutron_service_internalurl }}"
|
||||
- service: "{{ neutron_service_name }}"
|
||||
interface: "admin"
|
||||
url: "{{ neutron_service_adminurl }}"
|
||||
_service_catalog:
|
||||
- name: "{{ neutron_service_name }}"
|
||||
type: "{{ neutron_service_type }}"
|
||||
description: "{{ neutron_service_description }}"
|
||||
when:
|
||||
- "neutron_services['neutron-server']['group'] in group_names"
|
||||
- "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]"
|
||||
|
||||
@ -1,93 +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: "{{ neutron_service_setup_host }}"
|
||||
vars:
|
||||
ansible_python_interpreter: "{{ neutron_service_setup_host_python_interpreter }}"
|
||||
block:
|
||||
- name: Add service to the keystone service catalog
|
||||
os_keystone_service:
|
||||
cloud: default
|
||||
state: present
|
||||
name: "{{ neutron_service_name }}"
|
||||
service_type: "{{ neutron_service_type }}"
|
||||
description: "{{ neutron_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 user
|
||||
os_user:
|
||||
cloud: default
|
||||
state: present
|
||||
name: "{{ neutron_service_user_name }}"
|
||||
password: "{{ neutron_service_password }}"
|
||||
domain: default
|
||||
default_project: "{{ neutron_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not neutron_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: "{{ neutron_service_user_name }}"
|
||||
role: "{{ neutron_service_role_name }}"
|
||||
project: "{{ neutron_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not neutron_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: "{{ neutron_service_name }}"
|
||||
endpoint_interface: "{{ item.interface }}"
|
||||
url: "{{ item.url }}"
|
||||
region: "{{ neutron_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: "{{ neutron_service_publicurl }}"
|
||||
- interface: "internal"
|
||||
url: "{{ neutron_service_internalurl }}"
|
||||
- interface: "admin"
|
||||
url: "{{ neutron_service_adminurl }}"
|
||||
144
tasks/service_setup.yml
Normal file
144
tasks/service_setup.yml
Normal file
@ -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
|
||||
Loading…
Reference in New Issue
Block a user