From d8067821226a21567b70c6f107c8062c044f4423 Mon Sep 17 00:00:00 2001
From: Chris Krelle <nobodycam@gmail.com>
Date: Thu, 1 Dec 2016 11:05:05 -0800
Subject: [PATCH] Enable inspector by default

Set the default value for enable_inspector to True. Also
set the inspector default driver to pxe_ssh as the current default
'fake' is not enabled and causes the node to not be registered.

Change-Id: I86757706d88db95830959336b059e919417bf27d
---
 playbooks/roles/bifrost-ironic-install/defaults/main.yml    | 2 +-
 .../templates/ironic-inspector.conf.j2                      | 2 +-
 .../notes/enable_inspector_by_default-828fc1284d6a7c2b.yaml | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/enable_inspector_by_default-828fc1284d6a7c2b.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 5899439c8..2afcff11e 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -114,7 +114,7 @@ inventory_dhcp: False
 inventory_dns: False
 
 # Settings to enable the use of inspector
-enable_inspector: false
+enable_inspector: true
 inspector_auth: "noauth"
 inspector_debug: true
 inspector_manage_firewall: false
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2
index 02303ce5e..6a5e458a4 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2
@@ -31,5 +31,5 @@ always_store_ramdisk_logs = {{ inspector_store_ramdisk_logs | default('true') |
 node_not_found_hook = enroll
 
 [discovery]
-enroll_node_driver = {{ inspector.discovery.enroll_node_driver | default('fake') }}
+enroll_node_driver = {{ inspector.discovery.enroll_node_driver | default('pxe_ssh') }}
 {% endif %}
diff --git a/releasenotes/notes/enable_inspector_by_default-828fc1284d6a7c2b.yaml b/releasenotes/notes/enable_inspector_by_default-828fc1284d6a7c2b.yaml
new file mode 100644
index 000000000..44060375f
--- /dev/null
+++ b/releasenotes/notes/enable_inspector_by_default-828fc1284d6a7c2b.yaml
@@ -0,0 +1,6 @@
+---
+prelude: >
+    Inspector now installed and enabled by default.
+features:
+  - Changes default value for enable_inspector variable
+    from false to true.