Updated from OpenStack Ansible Tests
Change-Id: I702e6d74145e4547cd75f41b200eee1345dc76cd
This commit is contained in:
parent
3fc75ea13d
commit
af767a4c2a
28
.gitignore
vendored
28
.gitignore
vendored
@ -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 #
|
||||
###################
|
||||
*.com
|
||||
@ -33,25 +44,11 @@ logs/*
|
||||
|
||||
# OS generated files #
|
||||
######################
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
.idea
|
||||
.tox
|
||||
*.sublime*
|
||||
*.egg-info
|
||||
Icon?
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
.eggs
|
||||
|
||||
# User driven backup files #
|
||||
############################
|
||||
*.bak
|
||||
*.swp
|
||||
|
||||
# Generated by pbr while building docs
|
||||
######################################
|
||||
AUTHORS
|
||||
@ -70,6 +67,3 @@ tests/*.retry
|
||||
# Git clones
|
||||
openstack-ansible-ops
|
||||
previous
|
||||
|
||||
# Editor files
|
||||
.vscode
|
||||
|
@ -31,13 +31,26 @@
|
||||
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('') }}"
|
||||
domain_id: "default"
|
||||
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
|
||||
@ -88,10 +101,11 @@
|
||||
state: present
|
||||
name: "{{ item.name }}"
|
||||
password: "{{ item.password }}"
|
||||
domain: default
|
||||
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)
|
||||
@ -112,6 +126,7 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user