review: filelists for nodes

rq/default.yaml

@@ -1,26 +1,30 @@
 files:
-  __default: ['/etc/resolv.conf', '/etc/mcollective', '/etc/astute.yaml', '/root/anaconda*', '/root/*.log', '/root/*.ks', '/var/lib/puppet/state/last_run_summary.yaml', '/var/run/pcap_dir', '/var/lib/cloud']
+  __default: ['/etc/resolv.conf', '/etc/mcollective', '/etc/astute.yaml', '/root/anaconda*', '/root/*.log', '/root/*.ks', '/var/lib/puppet/state/last_run_summary.yaml', '/var/run/pcap_dir', '/var/lib/cloud', '/etc/default']
   by_roles:
-    controller: ['/etc/apache2', '/etc/keystone', '/etc/swift']
+    controller: ['/etc/apache2', '/etc/keystone', '/etc/swift', '/etc/ceph', '/etc/cinder', '/etc/glance', '/etc/haproxy', '/etc/heat', '/etc/mysql', '/etc/nova']
-    fuel: ['/etc/astute', '/etc/dnsmasq.conf', '/etc/centos-release', '/etc/fuel_build_number', '/etc/fuel_build_id', '/etc/cobbler', '/etc/cobbler.dnsmasq.conf', '/root/*.log']
+    cinder: ['/etc/cinder']
-    ceph: ['/root/.ceph*']
+    fuel: ['/etc/astute', '/etc/dnsmasq.conf', '/etc/centos-release', '/etc/fuel_build_number', '/etc/fuel_build_id', '/etc/cobbler', '/etc/cobbler.dnsmasq.conf', '/root/*.log', '/etc/fuel', '/etc/nailgun']
-    no_fuel: '/etc/hiera'
+    ceph: ['/root/.ceph*', '/etc/ceph']
+    compute: ['/etc/libvirt', '/etc/nova']
+    no_fuel: ['/etc/hiera', '/etc/neutron']
   by_os_platform:
-    ubuntu: ['/etc/lsb-release', '/etc/network']
+    ubuntu: ['/etc/apt', '/etc/lsb-release', '/etc/network']
-    centos: ['/etc/redhat-release', '/etc/sysconfig']
+    centos: ['/etc/redhat-release', '/etc/sysconfig', '/etc/yum', '/etc/yum.d']
-filelists:
+  by_release:
-  by_roles:
+    '9.0': ['/etc/fuel']
-    fuel: [etc-nailgun, etc-fuel]
+    '9.1': ['/etc/fuel']
-    ceph-osd: [etc-ceph]
+# filelists:
-    cinder: [etc-cinder]
+#   by_roles:
-    compute: [etc-nova, etc-libvirt]
+#     fuel: [etc-nailgun, etc-fuel]
-    controller: [etc-glance, etc-haproxy, etc-nova,
+#     ceph-osd: [etc-ceph]
-      etc-keystone, etc-neutron, etc-mysql]
+#     cinder: [etc-cinder]
-    # f3flight: removed etc-heat, etc-ceph-controller from controller since it's not always present, gives a warning
+#     compute: [etc-nova, etc-libvirt]
-    # f3flight: need to make a better way to decide which files to collect
+#     controller: [etc-glance, etc-haproxy, etc-nova,
-  by_os_platform:
+#       etc-keystone, etc-neutron, etc-mysql, etc-ceph, etc-heat]
-    centos: [etc-yum]
+#     # f3flight: need to make a better way to decide which files to collect
-    ubuntu: [etc-apt]
+#   by_os_platform:
+#     centos: [etc-yum]
+#     ubuntu: [etc-apt]
 scripts:
   by_release:
     '4.1':

rq/filelists/etc-ceph

@@ -1,3 +1,2 @@
 #ceph configs
-/etc/ceph/ceph.client.admin.keyring
+/etc/ceph/
-/etc/ceph/ceph.conf

rq/filelists/etc-ceph-controller

@@ -1 +0,0 @@
-/etc/ceph/ceph.conf

rq/filelists/etc-cinder

@@ -1,2 +1 @@
-/etc/cinder/api-paste.ini
+/etc/cinder/
-/etc/cinder/cinder.conf

rq/filelists/etc-glance

@@ -1,5 +1 @@
-/etc/glance/glance-api.conf
+/etc/glance/
-/etc/glance/glance-api-paste.ini
-/etc/glance/glance-cache.conf
-/etc/glance/glance-registry.conf
-/etc/glance/glance-registry-paste.ini

rq/filelists/etc-haproxy

@@ -1 +1 @@
-/etc/haproxy/conf.d/
+/etc/haproxy/

rq/filelists/etc-heat

@@ -1,2 +1 @@
-/etc/heat/heat.conf
+/etc/heat/
-/etc/heat/heat-engine.conf

rq/filelists/etc-keystone

@@ -1 +1 @@
-/etc/keystone/keystone.conf
+/etc/keystone/

rq/filelists/etc-libvirt

@@ -1 +1 @@
-/etc/libvirt/libvirtd.conf
+/etc/libvirt/

rq/filelists/etc-nailgun

@@ -1 +1 @@
-/etc/nailgun/version.yaml
+/etc/nailgun/

timmy/env.py

@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.19.2'
+version = '1.19.3'
 
 if __name__ == '__main__':
     import sys