diff --git a/rq/default.yaml b/rq/default.yaml index 9ef36e6..423ae0c 100644 --- a/rq/default.yaml +++ b/rq/default.yaml @@ -90,9 +90,8 @@ scripts: by_roles: fuel: [fuel-release, fuel-task-list, fuel-environment-list] cinder: [ovs-vsctl-show, cinder-manage] - compute: [compute-iptables-nat, ovs-dump-flows, compute-iptables, ovs-ofctl-show-bridges, - ovs-vsctl-show] - controller: [rabbitmqctl-list-queues, nova-service-list, iptables-namespaces, + compute: [ovs-dump-flows, ovs-ofctl-show-bridges, ovs-vsctl-show] + controller: [rabbitmqctl-list-queues, nova-service-list, rabbitmqctl-cluster-status, crm-resource-status, pcs-status, ovs-dump-flows, neutron-agent-list, mysql-status, ceph-mon-status, ovs-ofctl-show-bridges, rabbitmqctl-list-connections, ovs-vsctl-show, rabbitmqctl-report, mysql-size, rabbitmqctl-status, crm-resource-list, @@ -108,7 +107,7 @@ scripts: ubuntu: [dmesg-t-ubuntu, dpkg-l, apt-cache-policy] centos: [dmesg-centos, yum-list-installed, yum-v-repolist] __default: - [ip-ne, iptables, ipnetns, ss, ipa, iptables-nat, df-m, services-status, cpuinfo, df-i, ipro, mount, sysctl-a, pvdisplay, vgdisplay, lvdisplay, lsmod, dmidecode, cat-proc-interrupts, arp-an, uname-a, ps-auxwwf, uptime, dmsetup-info, brctl-show, blkid-o-list] + [ip-ne, iptables-nvL, iptables-save, iptables-namespaces-nvL, iptables-namespaces-save, ipnetns, ss, ipa, df-m, services-status, cpuinfo, df-i, ipro, mount, sysctl-a, pvdisplay, vgdisplay, lvdisplay, lsmod, dmidecode, cat-proc-interrupts, arp-an, uname-a, ps-auxwwf, uptime, dmsetup-info, brctl-show, blkid-o-list] logs: __default: path: '/var/log' diff --git a/rq/scripts/compute-iptables b/rq/scripts/compute-iptables deleted file mode 100644 index f967561..0000000 --- a/rq/scripts/compute-iptables +++ /dev/null @@ -1 +0,0 @@ -iptables -nvL \ No newline at end of file diff --git a/rq/scripts/compute-iptables-nat b/rq/scripts/compute-iptables-nat deleted file mode 100644 index 568b3d9..0000000 --- a/rq/scripts/compute-iptables-nat +++ /dev/null @@ -1 +0,0 @@ -iptables -nvL -t nat \ No newline at end of file diff --git a/rq/scripts/iptables-namespaces b/rq/scripts/iptables-namespaces deleted file mode 100644 index 228bf90..0000000 --- a/rq/scripts/iptables-namespaces +++ /dev/null @@ -1,6 +0,0 @@ -for i in $(ip netns) -do - echo "namespace:$i" - ip netns exec "$i" ${IPTABLES_STR} - ip netns exec "$i" ${IPTABLES_STR} -t nat -done diff --git a/rq/scripts/iptables-namespaces-nvL b/rq/scripts/iptables-namespaces-nvL new file mode 100644 index 0000000..a623519 --- /dev/null +++ b/rq/scripts/iptables-namespaces-nvL @@ -0,0 +1,5 @@ +for i in $(ip netns) +do + echo "namespace:$i" + ip netns exec "$i" iptables -nvL +done diff --git a/rq/scripts/iptables-namespaces-save b/rq/scripts/iptables-namespaces-save new file mode 100644 index 0000000..2c2155e --- /dev/null +++ b/rq/scripts/iptables-namespaces-save @@ -0,0 +1,5 @@ +for i in $(ip netns) +do + echo "namespace:$i" + ip netns exec "$i" iptables-save +done diff --git a/rq/scripts/iptables-nat b/rq/scripts/iptables-nat deleted file mode 100644 index 37df67c..0000000 --- a/rq/scripts/iptables-nat +++ /dev/null @@ -1 +0,0 @@ -${IPTABLES_STR} -t nat diff --git a/rq/scripts/iptables-nvL b/rq/scripts/iptables-nvL new file mode 100644 index 0000000..84fe611 --- /dev/null +++ b/rq/scripts/iptables-nvL @@ -0,0 +1 @@ +iptables -nvL diff --git a/rq/scripts/iptables-save b/rq/scripts/iptables-save new file mode 100644 index 0000000..42a064e --- /dev/null +++ b/rq/scripts/iptables-save @@ -0,0 +1 @@ +iptables-save diff --git a/timmy/conf.py b/timmy/conf.py index 0083c34..145d5a6 100644 --- a/timmy/conf.py +++ b/timmy/conf.py @@ -28,8 +28,7 @@ def load_conf(filename): conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no', '-oUserKnownHostsFile=/dev/null', '-oLogLevel=error', '-lroot', '-oBatchMode=yes'] - conf['env_vars'] = ['OPENRC=/root/openrc', 'IPTABLES_STR="iptables -nvL"', - 'LC_ALL="C"', 'LANG="C"'] + conf['env_vars'] = ['OPENRC=/root/openrc', 'LC_ALL="C"', 'LANG="C"'] conf['fuel_ip'] = '127.0.0.1' conf['fuel_api_user'] = 'admin' conf['fuel_api_pass'] = 'admin'