Remove old pre service setup tasks.
These are now in main_pre.yml and the role should be called seperatley with tasks_from targetting all keystone hosts before being called again with serial: settings appropraite for H/A deployments. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/843740 Change-Id: Iecb5567382d27ae6a875f8937f33aa7bb492252e
This commit is contained in:
parent
7ab6882066
commit
d02d038e94
@ -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.
|
|
||||||
|
|
||||||
- name: create the system group
|
|
||||||
group:
|
|
||||||
name: "{{ keystone_system_group_name }}"
|
|
||||||
state: "present"
|
|
||||||
system: "yes"
|
|
||||||
delegate_to: "{{ item }}"
|
|
||||||
with_items: "{{ ansible_play_hosts }}"
|
|
||||||
when: _keystone_is_first_play_host
|
|
||||||
|
|
||||||
- name: create additional groups
|
|
||||||
group:
|
|
||||||
name: "{{ item[1] }}"
|
|
||||||
state: "present"
|
|
||||||
system: "yes"
|
|
||||||
delegate_to: "{{ item[0] }}"
|
|
||||||
with_nested:
|
|
||||||
- "{{ ansible_play_hosts }}"
|
|
||||||
- "{{ keystone_system_additional_groups }}"
|
|
||||||
when: _keystone_is_first_play_host
|
|
||||||
|
|
||||||
- name: Create the keystone system user
|
|
||||||
user:
|
|
||||||
name: "{{ keystone_system_user_name }}"
|
|
||||||
group: "{{ keystone_system_group_name }}"
|
|
||||||
groups: "{{ keystone_system_additional_groups | join(',') }}"
|
|
||||||
comment: "{{ keystone_system_comment }}"
|
|
||||||
shell: "{{ keystone_system_shell }}"
|
|
||||||
system: "yes"
|
|
||||||
createhome: "yes"
|
|
||||||
home: "{{ keystone_system_user_home }}"
|
|
||||||
delegate_to: "{{ item }}"
|
|
||||||
with_items: "{{ ansible_play_hosts }}"
|
|
||||||
when: _keystone_is_first_play_host
|
|
||||||
|
|
||||||
# The fernet key repository is needed on all hosts even if only running against
|
|
||||||
# one host, so the delegation preps the directories on all hosts at once.
|
|
||||||
- name: Create keystone dir
|
|
||||||
file:
|
|
||||||
path: "{{ item[1].path | default(omit) }}"
|
|
||||||
src: "{{ item[1].src | default(omit) }}"
|
|
||||||
dest: "{{ item[1].dest | default(omit) }}"
|
|
||||||
state: "{{ item[1].state | default('directory') }}"
|
|
||||||
owner: "{{ item[1].owner|default(keystone_system_user_name) }}"
|
|
||||||
group: "{{ item[1].group|default(keystone_system_group_name) }}"
|
|
||||||
mode: "{{ item[1].mode | default(omit) }}"
|
|
||||||
force: "{{ item[1].force | default(omit) }}"
|
|
||||||
with_nested:
|
|
||||||
- "{{ ansible_play_hosts }}"
|
|
||||||
- - path: "/openstack"
|
|
||||||
mode: "0755"
|
|
||||||
owner: "root"
|
|
||||||
group: "root"
|
|
||||||
- dest: "/etc/keystone"
|
|
||||||
mode: "0755"
|
|
||||||
- path: "{{ keystone_credential_key_repository }}"
|
|
||||||
mode: "0750"
|
|
||||||
- path: "{{ keystone_ldap_domain_config_dir }}"
|
|
||||||
mode: "0750"
|
|
||||||
- path: "/etc/keystone/ssl"
|
|
||||||
- path: "{{ keystone_fernet_tokens_key_repository }}"
|
|
||||||
mode: "2750"
|
|
||||||
- path: "{{ keystone_system_user_home }}"
|
|
||||||
- path: "/var/www/cgi-bin"
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
- path: "/var/www/cgi-bin/keystone"
|
|
||||||
- path: "{{ keystone_security_txt_dir }}"
|
|
||||||
- path: "/etc/ansible/facts.d"
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
delegate_to: "{{ item[0] }}"
|
|
||||||
when: _keystone_is_first_play_host
|
|
||||||
|
|
||||||
- name: Create security.txt file
|
|
||||||
copy:
|
|
||||||
content: "{{ keystone_security_txt_content }}"
|
|
||||||
dest: "{{ keystone_security_txt_dir }}/security.txt"
|
|
||||||
when: keystone_security_txt_content is defined
|
|
@ -114,10 +114,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- import_tasks: keystone_pre_install.yml
|
|
||||||
tags:
|
|
||||||
- keystone-install
|
|
||||||
|
|
||||||
- import_tasks: keystone_install.yml
|
- import_tasks: keystone_install.yml
|
||||||
tags:
|
tags:
|
||||||
- keystone-install
|
- keystone-install
|
||||||
@ -133,10 +129,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- keystone-config
|
- keystone-config
|
||||||
|
|
||||||
- import_tasks: keystone_key_setup.yml
|
|
||||||
tags:
|
|
||||||
- keystone-config
|
|
||||||
|
|
||||||
- import_tasks: keystone_fernet.yml
|
- import_tasks: keystone_fernet.yml
|
||||||
when:
|
when:
|
||||||
- "'fernet' in keystone_token_provider"
|
- "'fernet' in keystone_token_provider"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user