service_setup: refactor service setup to a single file

Code Issues Proposed changes

This patch refactors the openstack user/service/endpoints creation to
service_setup.yml which will eventually be managed by
openstack-ansible-tests.
Change-Id: If4896f1711ac655c33b6d4132ffd74085cb0f3b1

This commit is contained in:

Dmitriy Rabotyagov

2019年08月08日 14:09:55 +03:00

parent d8822dcc8c

commit 4e93d82133

3 changed files with 189 additions and 110 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

31
tasks/main.yml

View File

@@ -135,7 +135,36 @@

- trove-config

- systemd-service

- import_tasks:trove_service_setup.yml

- import_tasks:service_setup.yml

vars:

_project_name:"{{ trove_service_project_name }}"

_project_domain:"{{ trove_service_project_domain_id }}"

_project_description:"{{ trove_service_description }}"

_service_adminuri_insecure:"{{ keystone_service_adminuri_insecure }}"

_service_setup_host:"{{ trove_service_setup_host }}"

_service_setup_host_python_interpreter:"{{ trove_service_setup_host_python_interpreter }}"

_service_project_name:"{{ trove_service_project_name }}"

_service_region:"{{ trove_service_region }}"

_service_users:|-

{% set users = [{'name': trove_admin_user_name, 'password': trove_service_password}] %}

{% for role in trove_service_admin_role_names %}

{% set _ = users.append({'name': trove_admin_user_name, 'role': role}) %}

{% endfor %}

{{ users }}

_service_endpoints:

- service:"{{ trove_service_name }}"

interface:"public"

url:"{{ trove_service_publicurl }}"

- service:"{{ trove_service_name }}"

interface:"internal"

url:"{{ trove_service_internalurl }}"

- service:"{{ trove_service_name }}"

interface:"admin"

url:"{{ trove_service_adminurl }}"

_service_catalog:

- name:"{{ trove_service_name }}"

type:"{{ trove_service_type }}"

description:"{{ trove_service_description }}"

when:inventory_hostname == groups['trove_api'][0]

tags:

- trove-install

159
tasks/service_setup.yml Normal file

View File

@@ -0,0 +1,159 @@

---

#

# 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

109
tasks/trove_service_setup.yml

View File

@@ -1,109 +0,0 @@

---

#

# 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:"{{ trove_service_setup_host }}"

vars:

ansible_python_interpreter:"{{ trove_service_setup_host_python_interpreter }}"

block:

- name:Add service to the keystone service catalog

os_keystone_service:

cloud:default

state:present

name:"{{ trove_service_name }}"

service_type:"{{ trove_service_type }}"

description:"{{ trove_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 project

os_project:

cloud:default

state:present

name:"{{ trove_service_project_name }}"

domain_id:"{{ trove_service_project_domain_id }}"

description:"{{ trove_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:"{{ trove_admin_user_name }}"

password:"{{ trove_service_password }}"

domain:default

default_project:"{{ trove_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 admin role

os_user_role:

cloud:default

state:present

user:"{{ trove_admin_user_name }}"

role:"{{ item }}"

project:"{{ trove_service_project_name }}"

endpoint_type:admin

verify:"{{ not keystone_service_adminuri_insecure }}"

register:add_service

until:add_service is success

retries:5

delay:10

with_items:"{{ trove_service_admin_role_names }}"

- name:Add endpoints to keystone endpoint catalog

os_keystone_endpoint:

cloud:default

state:present

service:"{{ trove_service_name }}"

endpoint_interface:"{{ item.interface }}"

url:"{{ item.url }}"

region:"{{ trove_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:"{{ trove_service_publicurl }}"

- interface:"internal"

url:"{{ trove_service_internalurl }}"

- interface:"admin"

url:"{{ trove_service_adminurl }}"