Tempest: remove all oslo.policy related stuff
The OpenStack Integration Test Suite (Tempest) doesn't use oslo.policy library. oslo.policy is not used in codebase and not set in requirements.txt: https://github.com/openstack/tempest/blob/master/requirements.txt#L14 All policy.json related stuff must be removed. Change-Id: I0d8ee710979a7eebba1e8fc176450e4c0bcbe757
This commit is contained in:
parent
8b58515e5d
commit
e6e48c30e3
@ -4,7 +4,6 @@
|
|||||||
service: "{{ tempest_services[service_name] }}"
|
service: "{{ tempest_services[service_name] }}"
|
||||||
config_json: "{{ tempest_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
config_json: "{{ tempest_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
tempest_conf: "{{ tempest_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
tempest_conf: "{{ tempest_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
policy_json: "{{ tempest_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
|
||||||
tempest_container: "{{ check_tempest_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
tempest_container: "{{ check_tempest_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
kolla_docker:
|
kolla_docker:
|
||||||
action: "recreate_or_restart_container"
|
action: "recreate_or_restart_container"
|
||||||
@ -19,5 +18,4 @@
|
|||||||
- service.enabled | bool
|
- service.enabled | bool
|
||||||
- config_json.changed | bool
|
- config_json.changed | bool
|
||||||
or tempest_conf.changed | bool
|
or tempest_conf.changed | bool
|
||||||
or policy_json.changed | bool
|
|
||||||
or tempest_container.changed | bool
|
or tempest_container.changed | bool
|
||||||
|
@ -37,23 +37,6 @@
|
|||||||
notify:
|
notify:
|
||||||
- Restart tempest container
|
- Restart tempest container
|
||||||
|
|
||||||
- name: Check if policies shall be overwritten
|
|
||||||
local_action: stat path="{{ node_custom_config }}/tempest/policy.json"
|
|
||||||
register: tempest_policy
|
|
||||||
|
|
||||||
- name: Copying over existing policy.json
|
|
||||||
template:
|
|
||||||
src: "{{ node_custom_config }}/tempest/policy.json"
|
|
||||||
dest: "{{ node_config_directory }}/{{ item.key }}/policy.json"
|
|
||||||
register: tempest_policy_jsons
|
|
||||||
when:
|
|
||||||
- tempest_policy.stat.exists
|
|
||||||
- inventory_hostname in groups[item.value.group]
|
|
||||||
- item.value.enabled | bool
|
|
||||||
with_dict: "{{ tempest_services }}"
|
|
||||||
notify:
|
|
||||||
- Restart tempest container
|
|
||||||
|
|
||||||
- name: Check tempest containers
|
- name: Check tempest containers
|
||||||
kolla_docker:
|
kolla_docker:
|
||||||
action: "compare_container"
|
action: "compare_container"
|
||||||
|
@ -6,13 +6,6 @@
|
|||||||
"dest": "/etc/tempest/tempest.conf",
|
"dest": "/etc/tempest/tempest.conf",
|
||||||
"owner": "root",
|
"owner": "root",
|
||||||
"perm": "0600"
|
"perm": "0600"
|
||||||
},
|
|
||||||
{
|
|
||||||
"source": "{{ container_config_directory }}/policy.json",
|
|
||||||
"dest": "/etc/tempest/policy.json",
|
|
||||||
"owner": "tempest",
|
|
||||||
"perm": "0600",
|
|
||||||
"optional": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user