From 915371319a4a90360d07fd19e84a9bb243a16bad Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Wed, 23 Apr 2014 22:05:16 +0000 Subject: [PATCH] Bridge private and public network for tempest Float ip needs route to private network so floating ip can be associated to a vm. Also make rsyslog config apply for logs from haproxy. Change-Id: I628bc8d6c7486301e1a9aba2cd78080285e33d8d --- misc/ci/tempest_run.sh | 3 ++- misc/rsyslog/rsyslog.conf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/ci/tempest_run.sh b/misc/ci/tempest_run.sh index 320d5d87..18c24bb5 100755 --- a/misc/ci/tempest_run.sh +++ b/misc/ci/tempest_run.sh @@ -75,11 +75,12 @@ keystone user-create --name demo --pass secret --tenant $demo_tenant_id keystone user-create --name alt_demo --pass secret --tenant $alt_demo_tenant_id image_id=`glance image-list |grep 'cirros'|awk '{print$2}'` private_net_id=`quantum net-create --tenant_id $demo_tenant_id private |grep " id " |awk '{print$4}'` -quantum subnet-create --tenant_id $demo_tenant_id --ip_version 4 --gateway 10.1.0.1 $private_net_id 10.10.0.0/24 +private_subnet_id=`quantum subnet-create --tenant_id $demo_tenant_id --ip_version 4 --gateway 10.10.0.1 $private_net_id 10.10.0.0/24|grep " id "|awk '{print$4}'` router_id=`quantum router-create --tenant_id $demo_tenant_id router1|grep " id " |awk '{print$4}'` public_net_id=`quantum net-create public -- --router:external=True |grep " id " |awk '{print$4}'` quantum subnet-create --ip_version 4 $public_net_id 172.24.4.0/24 -- --enable_dhcp=False quantum router-gateway-set $router_id $public_net_id +quantum router-interface-add router1 $private_subnet_id iniset /etc/tempest/tempest.conf identity uri $OS_AUTH_URL iniset /etc/tempest/tempest.conf identity admin_username $OS_USERNAME iniset /etc/tempest/tempest.conf identity admin_password $OS_PASSWORD diff --git a/misc/rsyslog/rsyslog.conf b/misc/rsyslog/rsyslog.conf index 0b29e510..6d587884 100644 --- a/misc/rsyslog/rsyslog.conf +++ b/misc/rsyslog/rsyslog.conf @@ -75,7 +75,7 @@ local7.* /var/log/boot.log local3.* -?Chef_log -if $syslogfacility-text == 'local4' then -?Openstack_log +local4.* -?Openstack_log # ### begin forwarding rule ### # The statement between the begin ... end define a SINGLE forwarding