x/timmy
Code Issues Proposed changes

Change: iptables collection, remove iptables from env

Browse Source 
Change-Id: I61814b92ad488c214f642a30a0a7636cd8db04f7
This commit is contained in:
Dmitry Sutyagin 2016-09-19 18:53:41 +03:00 committed by Aleksandr Dobdin
parent 0942e2dcef
commit 03def584a9
10 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rq/default.yaml
View File

@ -90,9 +90,8 @@ scripts:
by_roles: by_roles:
fuel: [fuel-release, fuel-task-list, fuel-environment-list] fuel: [fuel-release, fuel-task-list, fuel-environment-list]
cinder: [ovs-vsctl-show, cinder-manage] cinder: [ovs-vsctl-show, cinder-manage]
compute: [compute-iptables-nat, ovs-dump-flows, compute-iptables, ovs-ofctl-show-bridges, compute: [ovs-dump-flows, ovs-ofctl-show-bridges, ovs-vsctl-show]
ovs-vsctl-show] controller: [rabbitmqctl-list-queues, nova-service-list,
controller: [rabbitmqctl-list-queues, nova-service-list, iptables-namespaces,
rabbitmqctl-cluster-status, crm-resource-status, pcs-status, ovs-dump-flows, neutron-agent-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, mysql-status, ceph-mon-status, ovs-ofctl-show-bridges, rabbitmqctl-list-connections,
ovs-vsctl-show, rabbitmqctl-report, mysql-size, rabbitmqctl-status, crm-resource-list, 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] ubuntu: [dmesg-t-ubuntu, dpkg-l, apt-cache-policy]
centos: [dmesg-centos, yum-list-installed, yum-v-repolist] centos: [dmesg-centos, yum-list-installed, yum-v-repolist]
__default: __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: logs:
__default: __default:
path: '/var/log' path: '/var/log'

1
rq/scripts/compute-iptables
View File

@ -1 +0,0 @@
iptables -nvL

1
rq/scripts/compute-iptables-nat
View File

@ -1 +0,0 @@
iptables -nvL -t nat

6
rq/scripts/iptables-namespaces
View File

@ -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

5
rq/scripts/iptables-namespaces-nvL Normal file
View File

@ -0,0 +1,5 @@
for i in $(ip netns)
do
echo "namespace:$i"
ip netns exec "$i" iptables -nvL
done

5
rq/scripts/iptables-namespaces-save Normal file
View File

@ -0,0 +1,5 @@
for i in $(ip netns)
do
echo "namespace:$i"
ip netns exec "$i" iptables-save
done

1
rq/scripts/iptables-nat
View File

@ -1 +0,0 @@
${IPTABLES_STR} -t nat

1
rq/scripts/iptables-nvL Normal file
View File

@ -0,0 +1 @@
iptables -nvL

1
rq/scripts/iptables-save Normal file
View File

@ -0,0 +1 @@
iptables-save

3
timmy/conf.py
View File

@ -28,8 +28,7 @@ def load_conf(filename):
conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no', conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no',
'-oUserKnownHostsFile=/dev/null', '-oLogLevel=error', '-oUserKnownHostsFile=/dev/null', '-oLogLevel=error',
'-lroot', '-oBatchMode=yes'] '-lroot', '-oBatchMode=yes']
conf['env_vars'] = ['OPENRC=/root/openrc', 'IPTABLES_STR="iptables -nvL"', conf['env_vars'] = ['OPENRC=/root/openrc', 'LC_ALL="C"', 'LANG="C"']
'LC_ALL="C"', 'LANG="C"']
conf['fuel_ip'] = '127.0.0.1' conf['fuel_ip'] = '127.0.0.1'
conf['fuel_api_user'] = 'admin' conf['fuel_api_user'] = 'admin'
conf['fuel_api_pass'] = 'admin' conf['fuel_api_pass'] = 'admin'