[goal] Deprecate the JSON formatted policy file
As per the community goal of migrating the policy file
the format from JSON to YAML[1], we need to replace policy.json to
policy.yaml and remove deprecated policy.json.
config_template has been choosen instead of the copy, since it can
properly handle content that has been lookuped.
We make a separate task not to restart service when it's not needed.
CephFS Native hook has been removed since [2] as manila leverages MGR
now and doesn't require having directory in share.
Additionally bionic test is removed as we don't have Octopus infra
mirrors for it.
[1] https://governance.openstack.org/tc/goals/selected/wallaby/migrate-policy-format-from-json-to-yaml.html
[2] a830710939
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/791202
Change-Id: I7a1807e4b984e31cb6250132f35d4c27f0b69b0c
This commit is contained in:
parent
f404eb46c4
commit
de29f07d77
@ -28,22 +28,11 @@
|
|||||||
- "Restart manila services"
|
- "Restart manila services"
|
||||||
- "venv changed"
|
- "venv changed"
|
||||||
|
|
||||||
# Note (odyssey4me):
|
# NOTE (noonedeadpunk): Remove this task after Xena release
|
||||||
# The policy.json file is currently read continually by the services
|
- name: Remove obsoleted policy.json
|
||||||
# and is not only read on service start. We therefore cannot template
|
file:
|
||||||
# directly to the file read by the service because the new policies
|
path: "/etc/manila/policy.json"
|
||||||
# may not be valid until the service restarts. This is particularly
|
state: absent
|
||||||
# important during a major upgrade. We therefore only put the policy
|
|
||||||
# file in place after the service has been stopped.
|
|
||||||
#
|
|
||||||
- name: Copy new policy file into place
|
|
||||||
copy:
|
|
||||||
src: "/etc/manila/policy.json-{{ manila_venv_tag }}"
|
|
||||||
dest: "/etc/manila/policy.json"
|
|
||||||
owner: "root"
|
|
||||||
group: "{{ manila_system_group_name }}"
|
|
||||||
mode: "0640"
|
|
||||||
remote_src: yes
|
|
||||||
listen:
|
listen:
|
||||||
- "Restart manila services"
|
- "Restart manila services"
|
||||||
- "venv changed"
|
- "venv changed"
|
||||||
|
@ -193,10 +193,3 @@
|
|||||||
- _manila_is_first_play_host
|
- _manila_is_first_play_host
|
||||||
tags:
|
tags:
|
||||||
- manila-config
|
- manila-config
|
||||||
|
|
||||||
- import_tasks: manila_backend_cephfs.yml
|
|
||||||
when:
|
|
||||||
- manila_backend_rbd_inuse
|
|
||||||
- _manila_share_is_first_play_host
|
|
||||||
tags:
|
|
||||||
- manila-config
|
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019, 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 temporary mount dir
|
|
||||||
tempfile:
|
|
||||||
state: directory
|
|
||||||
suffix: manila_cephfs
|
|
||||||
register: _cephfs_mount_dir
|
|
||||||
|
|
||||||
- name: Mount CephFS
|
|
||||||
command: |
|
|
||||||
ceph-fuse --id "{{ item.value.cephfs_auth_id|default('manila') }}" "{{ _cephfs_mount_dir.path }}"
|
|
||||||
changed_when: false
|
|
||||||
|
|
||||||
- name: Ensure CephFS volumes dir permissions
|
|
||||||
file:
|
|
||||||
name: "{{ _cephfs_mount_dir.path }}/volumes"
|
|
||||||
state: directory
|
|
||||||
owner: "{{ manila_system_user_name }}"
|
|
||||||
|
|
||||||
- name: Unmount CephFS
|
|
||||||
mount:
|
|
||||||
path: "{{ _cephfs_mount_dir.path }}"
|
|
||||||
state: unmounted
|
|
||||||
|
|
||||||
- name: Remove temporary mount dir
|
|
||||||
file:
|
|
||||||
name: "{{ _cephfs_mount_dir.path }}"
|
|
||||||
state: absent
|
|
@ -38,6 +38,28 @@
|
|||||||
- Restart manila services
|
- Restart manila services
|
||||||
- Restart uwsgi services
|
- Restart uwsgi services
|
||||||
|
|
||||||
|
- name: Implement policy.yaml if there are overrides configured
|
||||||
|
config_template:
|
||||||
|
dest: "/etc/manila/policy.yaml"
|
||||||
|
config_overrides: "{{ manila_policy_overrides }}"
|
||||||
|
owner: "root"
|
||||||
|
group: "{{ manila_system_group_name }}"
|
||||||
|
mode: "0640"
|
||||||
|
config_type: "yaml"
|
||||||
|
when:
|
||||||
|
- manila_policy_overrides | length > 0
|
||||||
|
tags:
|
||||||
|
- manila-policy-override
|
||||||
|
|
||||||
|
- name: Remove legacy policy.yaml file
|
||||||
|
file:
|
||||||
|
path: "/etc/manila/policy.yaml"
|
||||||
|
state: absent
|
||||||
|
when:
|
||||||
|
- manila_policy_overrides | length == 0
|
||||||
|
tags:
|
||||||
|
- manila-policy-override
|
||||||
|
|
||||||
- name: Drop sudoers file
|
- name: Drop sudoers file
|
||||||
template:
|
template:
|
||||||
src: "sudoers.j2"
|
src: "sudoers.j2"
|
||||||
|
@ -1 +0,0 @@
|
|||||||
{}
|
|
@ -63,10 +63,6 @@ manila_core_files:
|
|||||||
dest: "/etc/manila/manila.conf"
|
dest: "/etc/manila/manila.conf"
|
||||||
config_overrides: "{{ manila_manila_conf_overrides }}"
|
config_overrides: "{{ manila_manila_conf_overrides }}"
|
||||||
config_type: "ini"
|
config_type: "ini"
|
||||||
- src: "policy.json.j2"
|
|
||||||
dest: "/etc/manila/policy.json-{{ manila_venv_tag }}"
|
|
||||||
config_overrides: "{{ manila_policy_overrides }}"
|
|
||||||
config_type: "json"
|
|
||||||
|
|
||||||
manila_rootwrap_files:
|
manila_rootwrap_files:
|
||||||
- condition: "{{ manila_install_method == 'source' }}"
|
- condition: "{{ manila_install_method == 'source' }}"
|
||||||
|
@ -21,13 +21,11 @@
|
|||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-ansible-deploy-aio_metal-ubuntu-bionic
|
|
||||||
- openstack-ansible-deploy-aio_metal-ubuntu-focal
|
- openstack-ansible-deploy-aio_metal-ubuntu-focal
|
||||||
- openstack-ansible-deploy-aio_metal-centos-8
|
- openstack-ansible-deploy-aio_metal-centos-8-stream
|
||||||
- openstack-ansible-deploy-aio_lxc-ubuntu-bionic:
|
- openstack-ansible-deploy-aio_lxc-ubuntu-focal:
|
||||||
voting: false
|
voting: false
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-ansible-deploy-aio_metal-ubuntu-bionic
|
|
||||||
- openstack-ansible-deploy-aio_metal-ubuntu-focal
|
- openstack-ansible-deploy-aio_metal-ubuntu-focal
|
||||||
- openstack-ansible-deploy-aio_metal-centos-8
|
- openstack-ansible-deploy-aio_metal-centos-8-stream
|
||||||
|
Loading…
x
Reference in New Issue
Block a user