Updated from OpenStack Ansible Tests

Change-Id: Iaee4b8e18c8f2173e3d4c7ef9d7d1f4e65d59985
This commit is contained in:
OpenStack Proposal Bot 2019-08-20 03:05:56 +00:00
parent 871bbc8e7f
commit 4c8dd7f0f3
2 changed files with 29 additions and 20 deletions

28
.gitignore vendored
View File

@ -1,3 +1,14 @@
# Add patterns in here to exclude files created by tools integrated with this
# repository, such as test frameworks from the project's recommended workflow,
# rendered documentation and package builds.
#
# Don't add patterns to exclude files created by preferred personal tools
# (editors, IDEs, your operating system itself even). These should instead be
# maintained outside the repository, for example in a ~/.gitignore file added
# with:
#
# git config --global core.excludesfile '~/.gitignore'
# Compiled source # # Compiled source #
################### ###################
*.com *.com
@ -33,25 +44,11 @@ logs/*
# OS generated files # # OS generated files #
###################### ######################
.DS_Store
.DS_Store?
._* ._*
.Spotlight-V100
.Trashes
.idea
.tox .tox
*.sublime*
*.egg-info *.egg-info
Icon?
ehthumbs.db
Thumbs.db
.eggs .eggs
# User driven backup files #
############################
*.bak
*.swp
# Generated by pbr while building docs # Generated by pbr while building docs
###################################### ######################################
AUTHORS AUTHORS
@ -70,6 +67,3 @@ tests/*.retry
# Git clones # Git clones
openstack-ansible-ops openstack-ansible-ops
previous previous
# Editor files
.vscode

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