Reviewed-by: Nick Lewis <[email protected]>
Signed-off-by: Jesse Wolfe <[email protected]>
---
Local-branch: t/next/6656
app/views/nodes/_inventory_service.html.haml | 2 +-
app/views/shared/_node_manager_sidebar.html.haml | 2 +-
config/settings.yml.example | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/views/nodes/_inventory_service.html.haml
b/app/views/nodes/_inventory_service.html.haml
index 21bbc7c..ae747b9 100644
--- a/app/views/nodes/_inventory_service.html.haml
+++ b/app/views/nodes/_inventory_service.html.haml
@@ -1,4 +1,4 @@
-- if SETTINGS.experimental_inventory_service
+- if SETTINGS.enable_inventory_service
.section
%h3 Inventory
%div#inventory
diff --git a/app/views/shared/_node_manager_sidebar.html.haml
b/app/views/shared/_node_manager_sidebar.html.haml
index 53824c4..c1cb2b1 100644
--- a/app/views/shared/_node_manager_sidebar.html.haml
+++ b/app/views/shared/_node_manager_sidebar.html.haml
@@ -23,7 +23,7 @@
%span.count{:class => counter_class(count, false)}= count
%li
= link_to "File Search", search_reports_path
- - if SETTINGS.experimental_inventory_service
+ - if SETTINGS.enable_inventory_service
%li
= link_to "Custom query", search_nodes_path
.footer.actionbar
diff --git a/config/settings.yml.example b/config/settings.yml.example
index 3cbf64f..fbbed1d 100644
--- a/config/settings.yml.example
+++ b/config/settings.yml.example
@@ -31,6 +31,9 @@ ca_port: 8140
# Key length for SSL certificates
key_length: 1024
+# The "inventory service" allows you to connect to a puppet master to retrieve
and node facts
+enable_inventory_service: false
+
# Hostname of the inventory server.
inventory_server: 'puppet'
--
1.7.3.5
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
