openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "service_setup: region override"

Browse Source
This commit is contained in:
Zuul 2019-08-02 20:32:32 +00:00 committed by Gerrit Code Review
commit 37b08d4940
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/main.yml
View File

@ -148,6 +148,7 @@
_service_project_name: "{{ cinder_service_project_name }}" _service_project_name: "{{ cinder_service_project_name }}"
_service_endpoints: "{{ cinder_service_endpoints }}" _service_endpoints: "{{ cinder_service_endpoints }}"
_service_catalog: "{{ cinder_service_catalog }}" _service_catalog: "{{ cinder_service_catalog }}"
_service_region: "{{ cinder_service_region }}"
_service_users: _service_users:
- name: "{{ cinder_service_user_name }}" - name: "{{ cinder_service_user_name }}"
password: "{{ cinder_service_password }}" password: "{{ cinder_service_password }}"

21
tasks/service_setup.yml
View File

@ -31,13 +31,26 @@
vars: vars:
ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}" ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
block: 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 - name: Add service project
os_project: os_project:
cloud: default cloud: default
state: present state: present
name: "{{ _project_name }}" name: "{{ _project_name }}"
description: "{{ _project_description | default('') }}" description: "{{ _project_description | default(omit) }}"
domain_id: "default" domain_id: "{{ _project_domain | default('default') }}"
endpoint_type: admin endpoint_type: admin
validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
register: add_service register: add_service
@ -88,10 +101,11 @@
state: present state: present
name: "{{ item.name }}" name: "{{ item.name }}"
password: "{{ item.password }}" password: "{{ item.password }}"
domain: default domain: "{{ item.domain | default('default') }}"
default_project: "{{ item.project | default(_service_project_name) }}" default_project: "{{ item.project | default(_service_project_name) }}"
endpoint_type: admin endpoint_type: admin
validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
update_password: always
register: add_service register: add_service
when: when:
- not (_service_in_ldap | default(False) | bool) - not (_service_in_ldap | default(False) | bool)
@ -112,6 +126,7 @@
user: "{{ item.name }}" user: "{{ item.name }}"
role: "{{ item.role }}" role: "{{ item.role }}"
project: "{{ item.project | default(_service_project_name) }}" project: "{{ item.project | default(_service_project_name) }}"
domain: "{{ item.domain | default(omit) }}"
endpoint_type: admin endpoint_type: admin
validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}" validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
register: add_service register: add_service