From d5f5fc0524cb6cb6dec411c68955f248822630a7 Mon Sep 17 00:00:00 2001 From: Chris Hambridge Date: Thu, 21 Sep 2017 14:14:22 -0400 Subject: [PATCH] Correcting documented facts to align with supported fact names. Closes #313. --- doc/source/command_syntax_usage.rst | 19 ++++++++++--------- rho/fact_docs.py | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/doc/source/command_syntax_usage.rst b/doc/source/command_syntax_usage.rst index e1b40f2..870c5ad 100644 --- a/doc/source/command_syntax_usage.rst +++ b/doc/source/command_syntax_usage.rst @@ -134,19 +134,19 @@ this contains a large amount of information about the operating system, hardware - ``dmi.processor-family`` - processor family - ``dmi.system-manufacturer`` - system manufacturer - ``etc-issue.etc-issue`` - contents of /etc/issue (or equivalent) -- ``etc-release.name`` - name of the release -- ``etc-release.release`` - release information -- ``etc-release.version`` - release version +- ``etc_release.name`` - name of the release +- ``etc_release.release`` - release information +- ``etc_release.version`` - release version - ``instnum.instnum`` - installation number -- ``jboss.brms.drools_core_ver`` - Drools version -- ``jboss.brms.kie_api_ver`` - KIE API version -- ``jboss.brms.kie_war_ver`` - KIE runtime version -- ``jboss.deploy_dates`` - List of deployment dates of JBoss installations +- ``jboss.brms.drools-core-ver`` - Drools version +- ``jboss.brms.kie-api-ver`` - KIE API version +- ``jboss.brms.kie-war-ver`` - KIE runtime version +- ``jboss.deploy-dates`` - List of deployment dates of JBoss installations - ``jboss.fuse.activemq-ver`` - ActiveMQ version - ``jboss.fuse.camel-ver`` - Camel version - ``jboss.fuse.cxf-ver`` - CXF version -- ``jboss.installed_versions`` - List of installed versions of JBoss -- ``jboss.running_versions`` - List of running versions of JBoss +- ``jboss.installed-versions`` - List of installed versions of JBoss +- ``jboss.running-versions`` - List of running versions of JBoss - ``redhat-packages.is_redhat`` - determines if package is a Red Hat package - ``redhat-packages.last_installed`` - last installed package - ``redhat-packages.last_built`` - last built package @@ -158,6 +158,7 @@ this contains a large amount of information about the operating system, hardware - ``subman.cpu.core(s)_per_socket`` - cpu cores per socket from subscription manager - ``subman.cpu.cpu(s)`` - cpus from subscription manager - ``subman.cpu.cpu_socket(s)`` - cpu sockets from subscription manager +- ``subman.has_facts_file`` - Whether subscription manager has a facts file - ``subman.virt.is_guest`` - Whether is a virtual guest from subscription manager - ``subman.virt.host_type`` - Virtual host type from subscription manager - ``subman.virt.uuid`` - Virtual host uuid from subscription manager diff --git a/rho/fact_docs.py b/rho/fact_docs.py index b109baa..2c4639c 100644 --- a/rho/fact_docs.py +++ b/rho/fact_docs.py @@ -29,19 +29,19 @@ (u'dmi.processor-family', u'processor family'), (u'dmi.system-manufacturer', u'system manufacturer'), (u'etc-issue.etc-issue', u'contents of /etc/issue (or equivalent)'), - (u'etc-release.name', u'name of the release'), - (u'etc-release.release', u'release information'), - (u'etc-release.version', u'release version'), + (u'etc_release.name', u'name of the release'), + (u'etc_release.release', u'release information'), + (u'etc_release.version', u'release version'), (u'instnum.instnum', u'installation number'), - (u'jboss.brms.drools_core_ver', u'Drools version'), - (u'jboss.brms.kie_api_ver', u'KIE API version'), - (u'jboss.brms.kie_war_ver', u'KIE runtime version'), - (u'jboss.deploy_dates', u'List of deployment dates of JBoss installations'), + (u'jboss.brms.drools-core-ver', u'Drools version'), + (u'jboss.brms.kie-api-ver', u'KIE API version'), + (u'jboss.brms.kie-war-ver', u'KIE runtime version'), + (u'jboss.deploy-dates', u'List of deployment dates of JBoss installations'), (u'jboss.fuse.activemq-ver', u'ActiveMQ version'), (u'jboss.fuse.camel-ver', u'Camel version'), (u'jboss.fuse.cxf-ver', u'CXF version'), - (u'jboss.installed_versions', u'List of installed versions of JBoss'), - (u'jboss.running_versions', u'List of running versions of JBoss'), + (u'jboss.installed-versions', u'List of installed versions of JBoss'), + (u'jboss.running-versions', u'List of running versions of JBoss'), (u'redhat-packages.is_redhat', u'determines if package is a Red Hat package'), (u'redhat-packages.last_installed', u'last installed package'), (u'redhat-packages.last_built', u'last built package'), @@ -53,6 +53,7 @@ (u'subman.cpu.core(s)_per_socket', u'cpu cores per socket from subscription manager'), (u'subman.cpu.cpu(s)', u'cpus from subscription manager'), (u'subman.cpu.cpu_socket(s)', u'cpu sockets from subscription manager'), + (u'subman.has_facts_file', u'Whether subscription manager has a facts file'), (u'subman.virt.is_guest', u'Whether is a virtual guest from subscription manager'), (u'subman.virt.host_type', u'Virtual host type from subscription manager'), (u'subman.virt.uuid', u'Virtual host uuid from subscription manager'),