Additional handler cleanup
Remove empty handler files and move image serve handler to the tasks. Change-Id: I454d8a8b87476e833a96beaf18b17047aee500f6 Related-Bug: #1888853
This commit is contained in:
parent
94dbec8c8a
commit
768e33e12b
|
@ -1,15 +0,0 @@
|
|||
---
|
||||
# Copyright 2020 Red Hat, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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.
|
|
@ -1,22 +0,0 @@
|
|||
---
|
||||
# Copyright 2019 Red Hat, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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: Cleanup temp file
|
||||
file:
|
||||
path: "{{ tempfile_1.path }}"
|
||||
state: absent
|
||||
delegate_to: localhost
|
||||
connection: local
|
|
@ -1,15 +0,0 @@
|
|||
---
|
||||
# Copyright 2019 Red Hat, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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.
|
|
@ -1,30 +0,0 @@
|
|||
---
|
||||
# Copyright 2019 Red Hat, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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: restart httpd
|
||||
command: /bin/true
|
||||
notify:
|
||||
- Image-Serve | reload systemd
|
||||
- Image-Serve | reload httpd
|
||||
listen: "restart httpd service"
|
||||
|
||||
- name: Image-Serve | reload httpd
|
||||
systemd:
|
||||
name: httpd
|
||||
state: restarted
|
||||
enabled: true
|
||||
daemon_reload: true
|
|
@ -19,6 +19,7 @@
|
|||
package:
|
||||
name: httpd
|
||||
state: present
|
||||
register: tripleo_image_serve_pkg_result
|
||||
|
||||
- name: create image data directory
|
||||
file:
|
||||
|
@ -43,12 +44,21 @@
|
|||
path: /etc/httpd/conf/httpd.conf
|
||||
regexp: '^\s*Listen(.*)$'
|
||||
line: '# Listen \1'
|
||||
register: tripleo_image_serve_httpd_config_result
|
||||
|
||||
- name: manage /etc/httpd/conf.d/image-serve.conf
|
||||
template:
|
||||
src: image-serve.conf.j2
|
||||
dest: /etc/httpd/conf.d/image-serve.conf
|
||||
notify: Image-Serve | reload httpd
|
||||
register: tripleo_image_serve_config_result
|
||||
|
||||
- name: force systemd to reread configs
|
||||
meta: flush_handlers
|
||||
- name: Image-Serve | restart httpd
|
||||
systemd:
|
||||
name: httpd
|
||||
state: restarted
|
||||
enabled: true
|
||||
daemon_reload: true
|
||||
when:
|
||||
- (tripleo_image_serve_pkg_result.changed or
|
||||
tripleo_image_serve_httpd_config_result.changed or
|
||||
tripleo_image_serve_config_result.changed)
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
---
|
||||
# Copyright 2020 Red Hat, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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.
|
Loading…
Reference in New Issue