Permalink
Browse files

Merge branch 'maint/3.2/testing' of git.eucalyptus-systems.com:eucaly…

…ptus into dev/juphoff/euca-4190
  • Loading branch information...
2 parents 4e0b1d2 + 51a01cd commit e0a8fde93ed90e726c7d43bc0bef9bf8583f06fc @juphoff juphoff committed Nov 21, 2012
@@ -176,7 +176,8 @@ if __name__ == "__main__":
if daemon:
# write log using pid in filename. Write new file so in case there is a pid collision over time,
# we don't have confusing logs containing 2 different processes output
- handler = logging.FileHandler(filename='/var/log/eucalyptus/console%s.log'%os.getpid(), mode='w')
+ handler = logging.handlers.SysLogHandler(address = '/dev/log')
+
logging.getLogger().addHandler(handler)
daemonize(start_console)
else:
@@ -394,8 +394,8 @@ inst_tbl_hdr_id = Instance ID
inst_tbl_hdr_state = Status
inst_tbl_hdr_image_id = Image ID
inst_tbl_hdr_availability_zone = Availability Zone
-inst_tbl_hdr_public_ip = Public IP
-inst_tbl_hdr_private_ip = Private IP
+inst_tbl_hdr_public_ip = Public
+inst_tbl_hdr_private_ip = Private
inst_tbl_hdr_keyname = Key Name
inst_tbl_hdr_sgroup = Security Group
inst_tbl_hdr_launch_time = Launch Time
@@ -394,8 +394,8 @@ inst_tbl_hdr_id = Instance ID
inst_tbl_hdr_state = Status
inst_tbl_hdr_image_id = Image ID
inst_tbl_hdr_availability_zone = Availability Zone
-inst_tbl_hdr_public_ip = Public IP
-inst_tbl_hdr_private_ip = Private IP
+inst_tbl_hdr_public_ip = Public
+inst_tbl_hdr_private_ip = Private
inst_tbl_hdr_keyname = Key Name
inst_tbl_hdr_sgroup = Security Group
inst_tbl_hdr_launch_time = Launch Time
@@ -394,8 +394,8 @@ inst_tbl_hdr_id = Instance ID
inst_tbl_hdr_state = Status
inst_tbl_hdr_image_id = Image ID
inst_tbl_hdr_availability_zone = Availability Zone
-inst_tbl_hdr_public_ip = Public IP
-inst_tbl_hdr_private_ip = Private IP
+inst_tbl_hdr_public_ip = Public
+inst_tbl_hdr_private_ip = Private
inst_tbl_hdr_keyname = Key Name
inst_tbl_hdr_sgroup = Security Group
inst_tbl_hdr_launch_time = Launch Time
@@ -394,8 +394,8 @@ inst_tbl_hdr_id = Instance ID
inst_tbl_hdr_state = Status
inst_tbl_hdr_image_id = Image ID
inst_tbl_hdr_availability_zone = Availability Zone
-inst_tbl_hdr_public_ip = Public IP
-inst_tbl_hdr_private_ip = Private IP
+inst_tbl_hdr_public_ip = Public
+inst_tbl_hdr_private_ip = Private
inst_tbl_hdr_keyname = Key Name
inst_tbl_hdr_sgroup = Security Group
inst_tbl_hdr_launch_time = Launch Time
@@ -395,8 +395,8 @@ inst_tbl_hdr_id = インスタンス ID
inst_tbl_hdr_state = 状態
inst_tbl_hdr_image_id = イメージ ID
inst_tbl_hdr_availability_zone = アベイラビリティゾーン
-inst_tbl_hdr_public_ip = パブリック IP
-inst_tbl_hdr_private_ip = プライベート IP
+inst_tbl_hdr_public_ip = パブリック
+inst_tbl_hdr_private_ip = プライベート
inst_tbl_hdr_keyname = キー名
inst_tbl_hdr_sgroup = セキュリティグループ
inst_tbl_hdr_launch_time = 起動時刻
@@ -395,8 +395,8 @@ inst_tbl_hdr_id = 인스턴스 아이디
inst_tbl_hdr_state = 상태
inst_tbl_hdr_image_id = 이미지 아이디
inst_tbl_hdr_availability_zone = 가용 존
-inst_tbl_hdr_public_ip = 외부 IP
-inst_tbl_hdr_private_ip = 내부 IP
+inst_tbl_hdr_public_ip = 외부
+inst_tbl_hdr_private_ip = 내부
inst_tbl_hdr_keyname = 키 이름
inst_tbl_hdr_sgroup = 보안 그룹
inst_tbl_hdr_launch_time = 시작 시간
@@ -395,8 +395,8 @@ inst_tbl_hdr_id = ИД экземпляра
inst_tbl_hdr_state = Статус
inst_tbl_hdr_image_id = ИД образа
inst_tbl_hdr_availability_zone = Зона
-inst_tbl_hdr_public_ip = Публичный IP адрес
-inst_tbl_hdr_private_ip = Частный IP адрес
+inst_tbl_hdr_public_ip = Публичный
+inst_tbl_hdr_private_ip = Частный
inst_tbl_hdr_keyname = Имя ключа
inst_tbl_hdr_sgroup = Группа безопасности
inst_tbl_hdr_launch_time = Время запуска
@@ -425,8 +425,8 @@ inst_tbl_hdr_id = 虚拟机实例 ID
inst_tbl_hdr_state = 状态
inst_tbl_hdr_image_id = 虚拟机映像 ID
inst_tbl_hdr_availability_zone = 可用区域
-inst_tbl_hdr_public_ip = 公有 IP
-inst_tbl_hdr_private_ip = 私有 IP
+inst_tbl_hdr_public_ip = 公有
+inst_tbl_hdr_private_ip = 私有
inst_tbl_hdr_keyname = 密钥对名
inst_tbl_hdr_sgroup = 安全组
inst_tbl_hdr_launch_time = 创建时间
@@ -87,8 +87,8 @@
},
{ "mDataProp": "image_id"},
{ "mDataProp": "placement" }, // TODO: placement==zone?
- { "mDataProp": "ip_address" },
- { "mDataProp": "private_ip_address" },
+ { "mDataProp": "public_dns_name" },
+ { "mDataProp": "private_dns_name" },
{ "mDataProp": "key_name" },
{ "mDataProp": "group_name" },
{

0 comments on commit e0a8fde

Please sign in to comment.