Merge "Stop supporting storing introspection data in nginx"

playbooks/roles/bifrost-ironic-install/README.md

@@ -245,16 +245,6 @@ inspector_processing_hooks: String value containing a comma-separated list,
                             non-default list of comma-separated processing
                             hooks for inspector.
 
-inspector_store_data_in_nginx: Boolean value, default false. If true, this
-                               enables data gathered during introspection to be
-                               stored in the local Nginx web server. In this
-                               mode, Nginx masquerades as an unauthenticated
-                               'Swift' object storage service. Nginx is
-                               configured to only allow the required operations
-                               on the 'ironic-inspector' object container.
-                               DEPRECATED: introspection data is stored in the
-                               database by default.
-
 ### Virtual Environment Install
 
 Bifrost installs ironic and other services into a python virtual environment

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -221,14 +221,6 @@ inspector_extra_kernel_options: "ipa-inspection-collectors=default,logs"
 # list of processing hooks for inspector.
 #inspector_processing_hooks:
 
-# Whether to store introspection data using the local Nginx web server as an
-# object storage service. DEPRECATED, the data can be stored in the database.
-inspector_store_data_in_nginx: false
-
-# When inspector_store_data_in_nginx is true, this is the URL of the Nginx
-# 'Swift' API endpoint.
-inspector_store_data_url: "http://localhost:{{ file_url_port }}"
-
 enable_inspector_discovery: true
 
 inspector_default_node_driver: "{{ 'manual-management' if enable_credential_less_deploy|bool else 'ipmi' }}"

playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml

@@ -334,15 +334,6 @@
      testing | bool == true
 - name: "Deploy nginx configuration file for serving HTTP requests"
   template: src=nginx.conf.j2 dest=/etc/nginx/nginx.conf
-- name: "Ensure inspector object storage directory exists"
-  file:
-    path: "{{ http_boot_folder }}/ironic-inspector"
-    state: directory
-    owner: "{{ nginx_user }}"
-    group: "{{ nginx_user }}"
-  when:
-    - enable_inspector | bool
-    - inspector_store_data_in_nginx | bool
 - name: "Download Ironic Python Agent kernel & image"
   include: download_ipa_image.yml
   when: create_ipa_image | bool == false and download_ipa | bool == true
@@ -422,15 +413,6 @@
         setype: httpd_sys_content_t
         state: present
 
-    - name: "Add proper context on inspector data store"
-      sefcontext:
-        target: "{{ http_boot_folder }}/ironic-inspector(/.*)?"
-        setype: httpd_sys_rw_content_t
-        state: present
-      when:
-        - enable_inspector | bool
-        - inspector_store_data_in_nginx | bool
-
     - name: Copy ironic policy file to temporary directory
       copy:
         src: ironic_policy.te

playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2

@@ -73,11 +73,7 @@ always_store_ramdisk_logs = {{ inspector_store_ramdisk_logs | default('true') |
 {% if inspector_processing_hooks is defined %}
 processing_hooks = {{ inspector_processing_hooks }}
 {% endif %}
-{% if inspector_store_data_in_nginx | bool %}
-store_data = swift
-{% else %}
 store_data = database
-{% endif %}
 {% if inspector.discovery.enabled == true %}
 node_not_found_hook = enroll
 power_off = {{ power_off_after_inspection }}
@@ -85,10 +81,3 @@ power_off = {{ power_off_after_inspection }}
 [discovery]
 enroll_node_driver = {{ inspector.discovery.default_node_driver }}
 {% endif %}
-
-{% if inspector_store_data_in_nginx | bool %}
-[swift]
-# Use the local nginx web server as a Swift-list object storage service.
-auth_type = none
-endpoint_override = {{ inspector_store_data_url }}
-{% endif %}

playbooks/roles/bifrost-ironic-install/templates/nginx.conf.j2

@@ -46,14 +46,6 @@ http {
 		location {{ http_boot_folder }}/ {
 			alias {{ http_boot_folder }}/;
 		}
-{% if inspector_store_data_in_nginx | bool %}
-                location /ironic-inspector {
-                        return 200 "";
-                }
-                location /ironic-inspector/ {
-                        dav_methods  PUT DELETE;
-                }
-{% endif %}
 	}
         include /etc/nginx/conf.d/bifrost*.conf;
 }

releasenotes/notes/no-store-nginx-75bc3f9068fb8f78.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Support for storing introspection data in nginx has been removed. It was
+    useful before ironic-inspector started supporting storing data in the
+    database, which is the default nowadays.