diff --git a/MANIFEST.in b/MANIFEST.in index 53b17a5..52cdc73 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ -recursive-include rq * recursive-include doc * -recursive-include config * +recursive-include timmy_data * include README.md diff --git a/setup.py b/setup.py index 9a46d48..2466e9f 100644 --- a/setup.py +++ b/setup.py @@ -21,16 +21,11 @@ import os from timmy.env import project_name, version pname = project_name -dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname) -rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files]) - for root, dirs, files in os.walk('rq')] -rqfiles.append((os.path.join(dtm, 'config'), - [os.path.join('config', 'example.yaml')])) -package_data = True +include_package_data = True if os.environ.get("READTHEDOCS", False): rqfiles = None - package_data = False + include_package_data = False setup(name=pname, @@ -43,10 +38,9 @@ setup(name=pname, 'operations: two-way data transfer, log collection, ' 'remote command execution'), long_description=open('README.md').read(), - packages=[pname], + packages=[pname, '%s_data' % pname], install_requires=['pyyaml'], - data_files=rqfiles, - include_package_data=package_data, + include_package_data=include_package_data, entry_points={'console_scripts': ['%s=%s.cli:main' % (pname, pname)]}, setup_requires=['pytest-runner'], tests_require=['pytest'] diff --git a/timmy/conf.py b/timmy/conf.py index 145d5a6..fc331a8 100644 --- a/timmy/conf.py +++ b/timmy/conf.py @@ -18,6 +18,8 @@ from tools import load_yaml_file from tempfile import gettempdir import os +from pkg_resources import resource_filename as resource_fn +from timmy.env import project_name def load_conf(filename): @@ -47,11 +49,8 @@ def load_conf(filename): conf['prefix'] = 'nice -n 19 ionice -c 3' rqdir = 'rq' rqfile = 'default.yaml' - dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', 'timmy') - if os.path.isdir(os.path.join(dtm, rqdir)): - conf['rqdir'] = os.path.join(dtm, rqdir) - else: - conf['rqdir'] = rqdir + data_package = '%s_data' % project_name + conf['rqdir'] = os.path.join(resource_fn(data_package, rqdir)) conf['rqfile'] = [{'file': os.path.join(conf['rqdir'], rqfile), 'default': True}] conf['compress_timeout'] = 3600 diff --git a/timmy_data/__init__.py b/timmy_data/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/config/example.yaml b/timmy_data/config/example.yaml similarity index 100% rename from config/example.yaml rename to timmy_data/config/example.yaml diff --git a/rq/default.yaml b/timmy_data/rq/default.yaml similarity index 100% rename from rq/default.yaml rename to timmy_data/rq/default.yaml diff --git a/rq/filelists/etc-apache2 b/timmy_data/rq/filelists/etc-apache2 similarity index 100% rename from rq/filelists/etc-apache2 rename to timmy_data/rq/filelists/etc-apache2 diff --git a/rq/filelists/etc-apt b/timmy_data/rq/filelists/etc-apt similarity index 100% rename from rq/filelists/etc-apt rename to timmy_data/rq/filelists/etc-apt diff --git a/rq/filelists/etc-astute b/timmy_data/rq/filelists/etc-astute similarity index 100% rename from rq/filelists/etc-astute rename to timmy_data/rq/filelists/etc-astute diff --git a/rq/filelists/etc-astute.yaml b/timmy_data/rq/filelists/etc-astute.yaml similarity index 100% rename from rq/filelists/etc-astute.yaml rename to timmy_data/rq/filelists/etc-astute.yaml diff --git a/rq/filelists/etc-centos-release b/timmy_data/rq/filelists/etc-centos-release similarity index 100% rename from rq/filelists/etc-centos-release rename to timmy_data/rq/filelists/etc-centos-release diff --git a/rq/filelists/etc-ceph b/timmy_data/rq/filelists/etc-ceph similarity index 100% rename from rq/filelists/etc-ceph rename to timmy_data/rq/filelists/etc-ceph diff --git a/rq/filelists/etc-cinder b/timmy_data/rq/filelists/etc-cinder similarity index 100% rename from rq/filelists/etc-cinder rename to timmy_data/rq/filelists/etc-cinder diff --git a/rq/filelists/etc-cobbler b/timmy_data/rq/filelists/etc-cobbler similarity index 100% rename from rq/filelists/etc-cobbler rename to timmy_data/rq/filelists/etc-cobbler diff --git a/rq/filelists/etc-default b/timmy_data/rq/filelists/etc-default similarity index 100% rename from rq/filelists/etc-default rename to timmy_data/rq/filelists/etc-default diff --git a/rq/filelists/etc-dnsmasq.conf b/timmy_data/rq/filelists/etc-dnsmasq.conf similarity index 100% rename from rq/filelists/etc-dnsmasq.conf rename to timmy_data/rq/filelists/etc-dnsmasq.conf diff --git a/rq/filelists/etc-fuel b/timmy_data/rq/filelists/etc-fuel similarity index 100% rename from rq/filelists/etc-fuel rename to timmy_data/rq/filelists/etc-fuel diff --git a/rq/filelists/etc-fuel_build_ b/timmy_data/rq/filelists/etc-fuel_build_ similarity index 100% rename from rq/filelists/etc-fuel_build_ rename to timmy_data/rq/filelists/etc-fuel_build_ diff --git a/rq/filelists/etc-glance b/timmy_data/rq/filelists/etc-glance similarity index 100% rename from rq/filelists/etc-glance rename to timmy_data/rq/filelists/etc-glance diff --git a/rq/filelists/etc-haproxy b/timmy_data/rq/filelists/etc-haproxy similarity index 100% rename from rq/filelists/etc-haproxy rename to timmy_data/rq/filelists/etc-haproxy diff --git a/rq/filelists/etc-heat b/timmy_data/rq/filelists/etc-heat similarity index 100% rename from rq/filelists/etc-heat rename to timmy_data/rq/filelists/etc-heat diff --git a/rq/filelists/etc-hiera b/timmy_data/rq/filelists/etc-hiera similarity index 100% rename from rq/filelists/etc-hiera rename to timmy_data/rq/filelists/etc-hiera diff --git a/rq/filelists/etc-ironic b/timmy_data/rq/filelists/etc-ironic similarity index 100% rename from rq/filelists/etc-ironic rename to timmy_data/rq/filelists/etc-ironic diff --git a/rq/filelists/etc-keystone b/timmy_data/rq/filelists/etc-keystone similarity index 100% rename from rq/filelists/etc-keystone rename to timmy_data/rq/filelists/etc-keystone diff --git a/rq/filelists/etc-libvirt b/timmy_data/rq/filelists/etc-libvirt similarity index 100% rename from rq/filelists/etc-libvirt rename to timmy_data/rq/filelists/etc-libvirt diff --git a/rq/filelists/etc-lsb-release b/timmy_data/rq/filelists/etc-lsb-release similarity index 100% rename from rq/filelists/etc-lsb-release rename to timmy_data/rq/filelists/etc-lsb-release diff --git a/rq/filelists/etc-mcollective b/timmy_data/rq/filelists/etc-mcollective similarity index 100% rename from rq/filelists/etc-mcollective rename to timmy_data/rq/filelists/etc-mcollective diff --git a/rq/filelists/etc-mysql b/timmy_data/rq/filelists/etc-mysql similarity index 100% rename from rq/filelists/etc-mysql rename to timmy_data/rq/filelists/etc-mysql diff --git a/rq/filelists/etc-nailgun b/timmy_data/rq/filelists/etc-nailgun similarity index 100% rename from rq/filelists/etc-nailgun rename to timmy_data/rq/filelists/etc-nailgun diff --git a/rq/filelists/etc-network b/timmy_data/rq/filelists/etc-network similarity index 100% rename from rq/filelists/etc-network rename to timmy_data/rq/filelists/etc-network diff --git a/rq/filelists/etc-neutron b/timmy_data/rq/filelists/etc-neutron similarity index 100% rename from rq/filelists/etc-neutron rename to timmy_data/rq/filelists/etc-neutron diff --git a/rq/filelists/etc-nova b/timmy_data/rq/filelists/etc-nova similarity index 100% rename from rq/filelists/etc-nova rename to timmy_data/rq/filelists/etc-nova diff --git a/rq/filelists/etc-redhat-release b/timmy_data/rq/filelists/etc-redhat-release similarity index 100% rename from rq/filelists/etc-redhat-release rename to timmy_data/rq/filelists/etc-redhat-release diff --git a/rq/filelists/etc-resolv.conf b/timmy_data/rq/filelists/etc-resolv.conf similarity index 100% rename from rq/filelists/etc-resolv.conf rename to timmy_data/rq/filelists/etc-resolv.conf diff --git a/rq/filelists/etc-swift b/timmy_data/rq/filelists/etc-swift similarity index 100% rename from rq/filelists/etc-swift rename to timmy_data/rq/filelists/etc-swift diff --git a/rq/filelists/etc-sysconfig b/timmy_data/rq/filelists/etc-sysconfig similarity index 100% rename from rq/filelists/etc-sysconfig rename to timmy_data/rq/filelists/etc-sysconfig diff --git a/rq/filelists/etc-yum b/timmy_data/rq/filelists/etc-yum similarity index 100% rename from rq/filelists/etc-yum rename to timmy_data/rq/filelists/etc-yum diff --git a/rq/filelists/etc-yum-d b/timmy_data/rq/filelists/etc-yum-d similarity index 100% rename from rq/filelists/etc-yum-d rename to timmy_data/rq/filelists/etc-yum-d diff --git a/rq/filelists/root-.ks b/timmy_data/rq/filelists/root-.ks similarity index 100% rename from rq/filelists/root-.ks rename to timmy_data/rq/filelists/root-.ks diff --git a/rq/filelists/root-.log b/timmy_data/rq/filelists/root-.log similarity index 100% rename from rq/filelists/root-.log rename to timmy_data/rq/filelists/root-.log diff --git a/rq/filelists/root-anaconda b/timmy_data/rq/filelists/root-anaconda similarity index 100% rename from rq/filelists/root-anaconda rename to timmy_data/rq/filelists/root-anaconda diff --git a/rq/filelists/root-ceph b/timmy_data/rq/filelists/root-ceph similarity index 100% rename from rq/filelists/root-ceph rename to timmy_data/rq/filelists/root-ceph diff --git a/rq/filelists/var-lib-cloud b/timmy_data/rq/filelists/var-lib-cloud similarity index 100% rename from rq/filelists/var-lib-cloud rename to timmy_data/rq/filelists/var-lib-cloud diff --git a/rq/filelists/var-lib-puppet-state-last_run_summary.yaml b/timmy_data/rq/filelists/var-lib-puppet-state-last_run_summary.yaml similarity index 100% rename from rq/filelists/var-lib-puppet-state-last_run_summary.yaml rename to timmy_data/rq/filelists/var-lib-puppet-state-last_run_summary.yaml diff --git a/rq/filelists/var-run-pcap_dir b/timmy_data/rq/filelists/var-run-pcap_dir similarity index 100% rename from rq/filelists/var-run-pcap_dir rename to timmy_data/rq/filelists/var-run-pcap_dir diff --git a/rq/neutron.yaml b/timmy_data/rq/neutron.yaml similarity index 100% rename from rq/neutron.yaml rename to timmy_data/rq/neutron.yaml diff --git a/rq/nova.yaml b/timmy_data/rq/nova.yaml similarity index 100% rename from rq/nova.yaml rename to timmy_data/rq/nova.yaml diff --git a/rq/scripts/apt-cache-policy b/timmy_data/rq/scripts/apt-cache-policy similarity index 100% rename from rq/scripts/apt-cache-policy rename to timmy_data/rq/scripts/apt-cache-policy diff --git a/rq/scripts/arp-an b/timmy_data/rq/scripts/arp-an similarity index 100% rename from rq/scripts/arp-an rename to timmy_data/rq/scripts/arp-an diff --git a/rq/scripts/blkid-o-list b/timmy_data/rq/scripts/blkid-o-list similarity index 100% rename from rq/scripts/blkid-o-list rename to timmy_data/rq/scripts/blkid-o-list diff --git a/rq/scripts/brctl-show b/timmy_data/rq/scripts/brctl-show similarity index 100% rename from rq/scripts/brctl-show rename to timmy_data/rq/scripts/brctl-show diff --git a/rq/scripts/cat-proc-interrupts b/timmy_data/rq/scripts/cat-proc-interrupts similarity index 100% rename from rq/scripts/cat-proc-interrupts rename to timmy_data/rq/scripts/cat-proc-interrupts diff --git a/rq/scripts/ceph-df b/timmy_data/rq/scripts/ceph-df similarity index 100% rename from rq/scripts/ceph-df rename to timmy_data/rq/scripts/ceph-df diff --git a/rq/scripts/ceph-health b/timmy_data/rq/scripts/ceph-health similarity index 100% rename from rq/scripts/ceph-health rename to timmy_data/rq/scripts/ceph-health diff --git a/rq/scripts/ceph-health-detail b/timmy_data/rq/scripts/ceph-health-detail similarity index 100% rename from rq/scripts/ceph-health-detail rename to timmy_data/rq/scripts/ceph-health-detail diff --git a/rq/scripts/ceph-mon-status b/timmy_data/rq/scripts/ceph-mon-status similarity index 100% rename from rq/scripts/ceph-mon-status rename to timmy_data/rq/scripts/ceph-mon-status diff --git a/rq/scripts/ceph-osd-status b/timmy_data/rq/scripts/ceph-osd-status similarity index 100% rename from rq/scripts/ceph-osd-status rename to timmy_data/rq/scripts/ceph-osd-status diff --git a/rq/scripts/ceph-osd-tree b/timmy_data/rq/scripts/ceph-osd-tree similarity index 100% rename from rq/scripts/ceph-osd-tree rename to timmy_data/rq/scripts/ceph-osd-tree diff --git a/rq/scripts/ceph-pg-dump b/timmy_data/rq/scripts/ceph-pg-dump similarity index 100% rename from rq/scripts/ceph-pg-dump rename to timmy_data/rq/scripts/ceph-pg-dump diff --git a/rq/scripts/ceph-s b/timmy_data/rq/scripts/ceph-s similarity index 100% rename from rq/scripts/ceph-s rename to timmy_data/rq/scripts/ceph-s diff --git a/rq/scripts/cinder-list b/timmy_data/rq/scripts/cinder-list similarity index 100% rename from rq/scripts/cinder-list rename to timmy_data/rq/scripts/cinder-list diff --git a/rq/scripts/cinder-manage b/timmy_data/rq/scripts/cinder-manage similarity index 100% rename from rq/scripts/cinder-manage rename to timmy_data/rq/scripts/cinder-manage diff --git a/rq/scripts/cpuinfo b/timmy_data/rq/scripts/cpuinfo similarity index 100% rename from rq/scripts/cpuinfo rename to timmy_data/rq/scripts/cpuinfo diff --git a/rq/scripts/crm-resource-list b/timmy_data/rq/scripts/crm-resource-list similarity index 100% rename from rq/scripts/crm-resource-list rename to timmy_data/rq/scripts/crm-resource-list diff --git a/rq/scripts/crm-resource-status b/timmy_data/rq/scripts/crm-resource-status similarity index 100% rename from rq/scripts/crm-resource-status rename to timmy_data/rq/scripts/crm-resource-status diff --git a/rq/scripts/df-i b/timmy_data/rq/scripts/df-i similarity index 100% rename from rq/scripts/df-i rename to timmy_data/rq/scripts/df-i diff --git a/rq/scripts/df-m b/timmy_data/rq/scripts/df-m similarity index 100% rename from rq/scripts/df-m rename to timmy_data/rq/scripts/df-m diff --git a/rq/scripts/dmesg-centos b/timmy_data/rq/scripts/dmesg-centos similarity index 100% rename from rq/scripts/dmesg-centos rename to timmy_data/rq/scripts/dmesg-centos diff --git a/rq/scripts/dmesg-t-ubuntu b/timmy_data/rq/scripts/dmesg-t-ubuntu similarity index 100% rename from rq/scripts/dmesg-t-ubuntu rename to timmy_data/rq/scripts/dmesg-t-ubuntu diff --git a/rq/scripts/dmidecode b/timmy_data/rq/scripts/dmidecode similarity index 100% rename from rq/scripts/dmidecode rename to timmy_data/rq/scripts/dmidecode diff --git a/rq/scripts/dmsetup-info b/timmy_data/rq/scripts/dmsetup-info similarity index 100% rename from rq/scripts/dmsetup-info rename to timmy_data/rq/scripts/dmsetup-info diff --git a/rq/scripts/docker-images b/timmy_data/rq/scripts/docker-images similarity index 100% rename from rq/scripts/docker-images rename to timmy_data/rq/scripts/docker-images diff --git a/rq/scripts/dpkg-l b/timmy_data/rq/scripts/dpkg-l similarity index 100% rename from rq/scripts/dpkg-l rename to timmy_data/rq/scripts/dpkg-l diff --git a/rq/scripts/free b/timmy_data/rq/scripts/free similarity index 100% rename from rq/scripts/free rename to timmy_data/rq/scripts/free diff --git a/rq/scripts/fuel-bootstrap-list b/timmy_data/rq/scripts/fuel-bootstrap-list similarity index 100% rename from rq/scripts/fuel-bootstrap-list rename to timmy_data/rq/scripts/fuel-bootstrap-list diff --git a/rq/scripts/fuel-docker-ps b/timmy_data/rq/scripts/fuel-docker-ps similarity index 100% rename from rq/scripts/fuel-docker-ps rename to timmy_data/rq/scripts/fuel-docker-ps diff --git a/rq/scripts/fuel-dockerctl-check b/timmy_data/rq/scripts/fuel-dockerctl-check similarity index 100% rename from rq/scripts/fuel-dockerctl-check rename to timmy_data/rq/scripts/fuel-dockerctl-check diff --git a/rq/scripts/fuel-dockerctl-list b/timmy_data/rq/scripts/fuel-dockerctl-list similarity index 100% rename from rq/scripts/fuel-dockerctl-list rename to timmy_data/rq/scripts/fuel-dockerctl-list diff --git a/rq/scripts/fuel-environment-list b/timmy_data/rq/scripts/fuel-environment-list similarity index 100% rename from rq/scripts/fuel-environment-list rename to timmy_data/rq/scripts/fuel-environment-list diff --git a/rq/scripts/fuel-notifications b/timmy_data/rq/scripts/fuel-notifications similarity index 100% rename from rq/scripts/fuel-notifications rename to timmy_data/rq/scripts/fuel-notifications diff --git a/rq/scripts/fuel-postgres-dump b/timmy_data/rq/scripts/fuel-postgres-dump similarity index 100% rename from rq/scripts/fuel-postgres-dump rename to timmy_data/rq/scripts/fuel-postgres-dump diff --git a/rq/scripts/fuel-release b/timmy_data/rq/scripts/fuel-release similarity index 100% rename from rq/scripts/fuel-release rename to timmy_data/rq/scripts/fuel-release diff --git a/rq/scripts/fuel-task-list b/timmy_data/rq/scripts/fuel-task-list similarity index 100% rename from rq/scripts/fuel-task-list rename to timmy_data/rq/scripts/fuel-task-list diff --git a/rq/scripts/ip-ne b/timmy_data/rq/scripts/ip-ne similarity index 100% rename from rq/scripts/ip-ne rename to timmy_data/rq/scripts/ip-ne diff --git a/rq/scripts/ipa b/timmy_data/rq/scripts/ipa similarity index 100% rename from rq/scripts/ipa rename to timmy_data/rq/scripts/ipa diff --git a/rq/scripts/ipnetns b/timmy_data/rq/scripts/ipnetns similarity index 100% rename from rq/scripts/ipnetns rename to timmy_data/rq/scripts/ipnetns diff --git a/rq/scripts/ipro b/timmy_data/rq/scripts/ipro similarity index 100% rename from rq/scripts/ipro rename to timmy_data/rq/scripts/ipro diff --git a/rq/scripts/ipset-list b/timmy_data/rq/scripts/ipset-list similarity index 100% rename from rq/scripts/ipset-list rename to timmy_data/rq/scripts/ipset-list diff --git a/rq/scripts/ipset-save b/timmy_data/rq/scripts/ipset-save similarity index 100% rename from rq/scripts/ipset-save rename to timmy_data/rq/scripts/ipset-save diff --git a/rq/scripts/iptables b/timmy_data/rq/scripts/iptables similarity index 100% rename from rq/scripts/iptables rename to timmy_data/rq/scripts/iptables diff --git a/rq/scripts/iptables-namespaces-nvL b/timmy_data/rq/scripts/iptables-namespaces-nvL similarity index 100% rename from rq/scripts/iptables-namespaces-nvL rename to timmy_data/rq/scripts/iptables-namespaces-nvL diff --git a/rq/scripts/iptables-namespaces-save b/timmy_data/rq/scripts/iptables-namespaces-save similarity index 100% rename from rq/scripts/iptables-namespaces-save rename to timmy_data/rq/scripts/iptables-namespaces-save diff --git a/rq/scripts/iptables-nvL b/timmy_data/rq/scripts/iptables-nvL similarity index 100% rename from rq/scripts/iptables-nvL rename to timmy_data/rq/scripts/iptables-nvL diff --git a/rq/scripts/iptables-save b/timmy_data/rq/scripts/iptables-save similarity index 100% rename from rq/scripts/iptables-save rename to timmy_data/rq/scripts/iptables-save diff --git a/rq/scripts/keystone-endpoint-list b/timmy_data/rq/scripts/keystone-endpoint-list similarity index 100% rename from rq/scripts/keystone-endpoint-list rename to timmy_data/rq/scripts/keystone-endpoint-list diff --git a/rq/scripts/keystone-tenant-list b/timmy_data/rq/scripts/keystone-tenant-list similarity index 100% rename from rq/scripts/keystone-tenant-list rename to timmy_data/rq/scripts/keystone-tenant-list diff --git a/rq/scripts/lsmod b/timmy_data/rq/scripts/lsmod similarity index 100% rename from rq/scripts/lsmod rename to timmy_data/rq/scripts/lsmod diff --git a/rq/scripts/lvdisplay b/timmy_data/rq/scripts/lvdisplay similarity index 100% rename from rq/scripts/lvdisplay rename to timmy_data/rq/scripts/lvdisplay diff --git a/rq/scripts/mongo-replica-conf b/timmy_data/rq/scripts/mongo-replica-conf similarity index 100% rename from rq/scripts/mongo-replica-conf rename to timmy_data/rq/scripts/mongo-replica-conf diff --git a/rq/scripts/mongo-replication-status b/timmy_data/rq/scripts/mongo-replication-status similarity index 100% rename from rq/scripts/mongo-replication-status rename to timmy_data/rq/scripts/mongo-replication-status diff --git a/rq/scripts/mongo-status b/timmy_data/rq/scripts/mongo-status similarity index 100% rename from rq/scripts/mongo-status rename to timmy_data/rq/scripts/mongo-status diff --git a/rq/scripts/mount b/timmy_data/rq/scripts/mount similarity index 100% rename from rq/scripts/mount rename to timmy_data/rq/scripts/mount diff --git a/rq/scripts/mysql-size b/timmy_data/rq/scripts/mysql-size similarity index 100% rename from rq/scripts/mysql-size rename to timmy_data/rq/scripts/mysql-size diff --git a/rq/scripts/mysql-status b/timmy_data/rq/scripts/mysql-status similarity index 100% rename from rq/scripts/mysql-status rename to timmy_data/rq/scripts/mysql-status diff --git a/rq/scripts/neutron-agent-list b/timmy_data/rq/scripts/neutron-agent-list similarity index 100% rename from rq/scripts/neutron-agent-list rename to timmy_data/rq/scripts/neutron-agent-list diff --git a/rq/scripts/neutron-net-list b/timmy_data/rq/scripts/neutron-net-list similarity index 100% rename from rq/scripts/neutron-net-list rename to timmy_data/rq/scripts/neutron-net-list diff --git a/rq/scripts/neutron-port-list b/timmy_data/rq/scripts/neutron-port-list similarity index 100% rename from rq/scripts/neutron-port-list rename to timmy_data/rq/scripts/neutron-port-list diff --git a/rq/scripts/neutron-router-list b/timmy_data/rq/scripts/neutron-router-list similarity index 100% rename from rq/scripts/neutron-router-list rename to timmy_data/rq/scripts/neutron-router-list diff --git a/rq/scripts/neutron-subnet-list b/timmy_data/rq/scripts/neutron-subnet-list similarity index 100% rename from rq/scripts/neutron-subnet-list rename to timmy_data/rq/scripts/neutron-subnet-list diff --git a/rq/scripts/nova-list b/timmy_data/rq/scripts/nova-list similarity index 100% rename from rq/scripts/nova-list rename to timmy_data/rq/scripts/nova-list diff --git a/rq/scripts/nova-manage-vm-list b/timmy_data/rq/scripts/nova-manage-vm-list similarity index 100% rename from rq/scripts/nova-manage-vm-list rename to timmy_data/rq/scripts/nova-manage-vm-list diff --git a/rq/scripts/nova-service-list b/timmy_data/rq/scripts/nova-service-list similarity index 100% rename from rq/scripts/nova-service-list rename to timmy_data/rq/scripts/nova-service-list diff --git a/rq/scripts/nova-usage-list b/timmy_data/rq/scripts/nova-usage-list similarity index 100% rename from rq/scripts/nova-usage-list rename to timmy_data/rq/scripts/nova-usage-list diff --git a/rq/scripts/ntpq b/timmy_data/rq/scripts/ntpq similarity index 100% rename from rq/scripts/ntpq rename to timmy_data/rq/scripts/ntpq diff --git a/rq/scripts/ovs-dump-flows b/timmy_data/rq/scripts/ovs-dump-flows similarity index 100% rename from rq/scripts/ovs-dump-flows rename to timmy_data/rq/scripts/ovs-dump-flows diff --git a/rq/scripts/ovs-ofctl-show-bridges b/timmy_data/rq/scripts/ovs-ofctl-show-bridges similarity index 100% rename from rq/scripts/ovs-ofctl-show-bridges rename to timmy_data/rq/scripts/ovs-ofctl-show-bridges diff --git a/rq/scripts/ovs-vsctl-show b/timmy_data/rq/scripts/ovs-vsctl-show similarity index 100% rename from rq/scripts/ovs-vsctl-show rename to timmy_data/rq/scripts/ovs-vsctl-show diff --git a/rq/scripts/parted-l b/timmy_data/rq/scripts/parted-l similarity index 100% rename from rq/scripts/parted-l rename to timmy_data/rq/scripts/parted-l diff --git a/rq/scripts/pcs-status b/timmy_data/rq/scripts/pcs-status similarity index 100% rename from rq/scripts/pcs-status rename to timmy_data/rq/scripts/pcs-status diff --git a/rq/scripts/postgres-dump-docker b/timmy_data/rq/scripts/postgres-dump-docker similarity index 100% rename from rq/scripts/postgres-dump-docker rename to timmy_data/rq/scripts/postgres-dump-docker diff --git a/rq/scripts/ps-auxwwf b/timmy_data/rq/scripts/ps-auxwwf similarity index 100% rename from rq/scripts/ps-auxwwf rename to timmy_data/rq/scripts/ps-auxwwf diff --git a/rq/scripts/pvdisplay b/timmy_data/rq/scripts/pvdisplay similarity index 100% rename from rq/scripts/pvdisplay rename to timmy_data/rq/scripts/pvdisplay diff --git a/rq/scripts/python.example b/timmy_data/rq/scripts/python.example similarity index 100% rename from rq/scripts/python.example rename to timmy_data/rq/scripts/python.example diff --git a/rq/scripts/rabbitmqctl-cluster-status b/timmy_data/rq/scripts/rabbitmqctl-cluster-status similarity index 100% rename from rq/scripts/rabbitmqctl-cluster-status rename to timmy_data/rq/scripts/rabbitmqctl-cluster-status diff --git a/rq/scripts/rabbitmqctl-list-connections b/timmy_data/rq/scripts/rabbitmqctl-list-connections similarity index 100% rename from rq/scripts/rabbitmqctl-list-connections rename to timmy_data/rq/scripts/rabbitmqctl-list-connections diff --git a/rq/scripts/rabbitmqctl-list-queues b/timmy_data/rq/scripts/rabbitmqctl-list-queues similarity index 100% rename from rq/scripts/rabbitmqctl-list-queues rename to timmy_data/rq/scripts/rabbitmqctl-list-queues diff --git a/rq/scripts/rabbitmqctl-report b/timmy_data/rq/scripts/rabbitmqctl-report similarity index 100% rename from rq/scripts/rabbitmqctl-report rename to timmy_data/rq/scripts/rabbitmqctl-report diff --git a/rq/scripts/rabbitmqctl-status b/timmy_data/rq/scripts/rabbitmqctl-status similarity index 100% rename from rq/scripts/rabbitmqctl-status rename to timmy_data/rq/scripts/rabbitmqctl-status diff --git a/rq/scripts/selinux b/timmy_data/rq/scripts/selinux similarity index 100% rename from rq/scripts/selinux rename to timmy_data/rq/scripts/selinux diff --git a/rq/scripts/services-status b/timmy_data/rq/scripts/services-status similarity index 100% rename from rq/scripts/services-status rename to timmy_data/rq/scripts/services-status diff --git a/rq/scripts/shotgun2-report b/timmy_data/rq/scripts/shotgun2-report similarity index 100% rename from rq/scripts/shotgun2-report rename to timmy_data/rq/scripts/shotgun2-report diff --git a/rq/scripts/ss b/timmy_data/rq/scripts/ss similarity index 100% rename from rq/scripts/ss rename to timmy_data/rq/scripts/ss diff --git a/rq/scripts/sysctl-a b/timmy_data/rq/scripts/sysctl-a similarity index 100% rename from rq/scripts/sysctl-a rename to timmy_data/rq/scripts/sysctl-a diff --git a/rq/scripts/uname-a b/timmy_data/rq/scripts/uname-a similarity index 100% rename from rq/scripts/uname-a rename to timmy_data/rq/scripts/uname-a diff --git a/rq/scripts/uptime b/timmy_data/rq/scripts/uptime similarity index 100% rename from rq/scripts/uptime rename to timmy_data/rq/scripts/uptime diff --git a/rq/scripts/vgdisplay b/timmy_data/rq/scripts/vgdisplay similarity index 100% rename from rq/scripts/vgdisplay rename to timmy_data/rq/scripts/vgdisplay diff --git a/rq/scripts/yum-list-installed b/timmy_data/rq/scripts/yum-list-installed similarity index 100% rename from rq/scripts/yum-list-installed rename to timmy_data/rq/scripts/yum-list-installed diff --git a/rq/scripts/yum-v-repolist b/timmy_data/rq/scripts/yum-v-repolist similarity index 100% rename from rq/scripts/yum-v-repolist rename to timmy_data/rq/scripts/yum-v-repolist