diff --git a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb index 9361327c69..6daa79eea0 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb @@ -6,10 +6,10 @@ # [loggers] -keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_ubuntu-trusty,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_ubuntu-trusty,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_ubuntu-trusty,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib +keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib [handlers] -keys=console,debug,normal,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_ubuntu-trusty,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_ubuntu-trusty,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_ubuntu-trusty,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,hpcloud-b1_ubuntu-trusty,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_centos-6,hpcloud-b2_ubuntu-trusty,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_centos-6,hpcloud-b3_ubuntu-trusty,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_centos-6,hpcloud-b4_ubuntu-trusty,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_centos-6,hpcloud-b5_ubuntu-trusty,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib +keys=console,debug,normal,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-f21,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib [formatters] keys=simple @@ -137,18 +137,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-dfw.centos-6.log', 'H', 8, 30,) -[logger_rax-dfw_ubuntu-trusty] -level=INFO -handlers=rax-dfw_ubuntu-trusty -qualname=nodepool.image.build.rax-dfw.ubuntu-trusty -propagate=0 - -[handler_rax-dfw_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/rax-dfw.ubuntu-trusty.log', 'H', 8, 30,) - [logger_rax-dfw_devstack-f21] level=INFO handlers=rax-dfw_devstack-f21 @@ -245,18 +233,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-ord.centos-6.log', 'H', 8, 30,) -[logger_rax-ord_ubuntu-trusty] -level=INFO -handlers=rax-ord_ubuntu-trusty -qualname=nodepool.image.build.rax-ord.ubuntu-trusty -propagate=0 - -[handler_rax-ord_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/rax-ord.ubuntu-trusty.log', 'H', 8, 30,) - [logger_rax-ord_devstack-f21] level=INFO handlers=rax-ord_devstack-f21 @@ -353,18 +329,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-iad.centos-6.log', 'H', 8, 30,) -[logger_rax-iad_ubuntu-trusty] -level=INFO -handlers=rax-iad_ubuntu-trusty -qualname=nodepool.image.build.rax-iad.ubuntu-trusty -propagate=0 - -[handler_rax-iad_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/rax-iad.ubuntu-trusty.log', 'H', 8, 30,) - [logger_rax-iad_devstack-precise-check] level=INFO handlers=rax-iad_devstack-precise-check @@ -425,18 +389,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-precise-check.log', 'H', 8, 30,) -[logger_hpcloud-b1_devstack-precise] -level=INFO -handlers=hpcloud-b1_devstack-precise -qualname=nodepool.image.build.hpcloud-b1.devstack-precise -propagate=0 - -[handler_hpcloud-b1_devstack-precise] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-precise.log', 'H', 8, 30,) - [logger_hpcloud-b1_bare-precise] level=INFO handlers=hpcloud-b1_bare-precise @@ -449,18 +401,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b1.bare-precise.log', 'H', 8, 30,) -[logger_hpcloud-b1_devstack-trusty] -level=INFO -handlers=hpcloud-b1_devstack-trusty -qualname=nodepool.image.build.hpcloud-b1.devstack-trusty -propagate=0 - -[handler_hpcloud-b1_devstack-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b1_bare-trusty] level=INFO handlers=hpcloud-b1_bare-trusty @@ -485,30 +425,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b1.bare-centos6.log', 'H', 8, 30,) -[logger_hpcloud-b1_centos-6] -level=INFO -handlers=hpcloud-b1_centos-6 -qualname=nodepool.image.build.hpcloud-b1.centos-6 -propagate=0 - -[handler_hpcloud-b1_centos-6] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.centos-6.log', 'H', 8, 30,) - -[logger_hpcloud-b1_ubuntu-trusty] -level=INFO -handlers=hpcloud-b1_ubuntu-trusty -qualname=nodepool.image.build.hpcloud-b1.ubuntu-trusty -propagate=0 - -[handler_hpcloud-b1_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.ubuntu-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b1_devstack-f21] level=INFO handlers=hpcloud-b1_devstack-f21 @@ -533,30 +449,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-centos7.log', 'H', 8, 30,) -[logger_hpcloud-b1_devstack-centos7-dib] -level=INFO -handlers=hpcloud-b1_devstack-centos7-dib -qualname=nodepool.image.build.hpcloud-b1.devstack-centos7-dib -propagate=0 - -[handler_hpcloud-b1_devstack-centos7-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-centos7-dib.log', 'H', 8, 30,) - -[logger_hpcloud-b1_devstack-fedora21-dib] -level=INFO -handlers=hpcloud-b1_devstack-fedora21-dib -qualname=nodepool.image.build.hpcloud-b1.devstack-fedora21-dib -propagate=0 - -[handler_hpcloud-b1_devstack-fedora21-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-fedora21-dib.log', 'H', 8, 30,) - [logger_hpcloud-b2_devstack-precise-check] level=INFO handlers=hpcloud-b2_devstack-precise-check @@ -569,18 +461,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-precise-check.log', 'H', 8, 30,) -[logger_hpcloud-b2_devstack-precise] -level=INFO -handlers=hpcloud-b2_devstack-precise -qualname=nodepool.image.build.hpcloud-b2.devstack-precise -propagate=0 - -[handler_hpcloud-b2_devstack-precise] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-precise.log', 'H', 8, 30,) - [logger_hpcloud-b2_bare-precise] level=INFO handlers=hpcloud-b2_bare-precise @@ -593,18 +473,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b2.bare-precise.log', 'H', 8, 30,) -[logger_hpcloud-b2_devstack-trusty] -level=INFO -handlers=hpcloud-b2_devstack-trusty -qualname=nodepool.image.build.hpcloud-b2.devstack-trusty -propagate=0 - -[handler_hpcloud-b2_devstack-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b2_bare-trusty] level=INFO handlers=hpcloud-b2_bare-trusty @@ -629,30 +497,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b2.bare-centos6.log', 'H', 8, 30,) -[logger_hpcloud-b2_centos-6] -level=INFO -handlers=hpcloud-b2_centos-6 -qualname=nodepool.image.build.hpcloud-b2.centos-6 -propagate=0 - -[handler_hpcloud-b2_centos-6] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.centos-6.log', 'H', 8, 30,) - -[logger_hpcloud-b2_ubuntu-trusty] -level=INFO -handlers=hpcloud-b2_ubuntu-trusty -qualname=nodepool.image.build.hpcloud-b2.ubuntu-trusty -propagate=0 - -[handler_hpcloud-b2_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.ubuntu-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b2_devstack-f21] level=INFO handlers=hpcloud-b2_devstack-f21 @@ -677,30 +521,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-centos7.log', 'H', 8, 30,) -[logger_hpcloud-b2_devstack-centos7-dib] -level=INFO -handlers=hpcloud-b2_devstack-centos7-dib -qualname=nodepool.image.build.hpcloud-b2.devstack-centos7-dib -propagate=0 - -[handler_hpcloud-b2_devstack-centos7-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-centos7-dib.log', 'H', 8, 30,) - -[logger_hpcloud-b2_devstack-fedora21-dib] -level=INFO -handlers=hpcloud-b2_devstack-fedora21-dib -qualname=nodepool.image.build.hpcloud-b2.devstack-fedora21-dib -propagate=0 - -[handler_hpcloud-b2_devstack-fedora21-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-fedora21-dib.log', 'H', 8, 30,) - [logger_hpcloud-b3_devstack-precise-check] level=INFO handlers=hpcloud-b3_devstack-precise-check @@ -713,18 +533,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-precise-check.log', 'H', 8, 30,) -[logger_hpcloud-b3_devstack-precise] -level=INFO -handlers=hpcloud-b3_devstack-precise -qualname=nodepool.image.build.hpcloud-b3.devstack-precise -propagate=0 - -[handler_hpcloud-b3_devstack-precise] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-precise.log', 'H', 8, 30,) - [logger_hpcloud-b3_bare-precise] level=INFO handlers=hpcloud-b3_bare-precise @@ -737,18 +545,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b3.bare-precise.log', 'H', 8, 30,) -[logger_hpcloud-b3_devstack-trusty] -level=INFO -handlers=hpcloud-b3_devstack-trusty -qualname=nodepool.image.build.hpcloud-b3.devstack-trusty -propagate=0 - -[handler_hpcloud-b3_devstack-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b3_bare-trusty] level=INFO handlers=hpcloud-b3_bare-trusty @@ -773,30 +569,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b3.bare-centos6.log', 'H', 8, 30,) -[logger_hpcloud-b3_centos-6] -level=INFO -handlers=hpcloud-b3_centos-6 -qualname=nodepool.image.build.hpcloud-b3.centos-6 -propagate=0 - -[handler_hpcloud-b3_centos-6] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.centos-6.log', 'H', 8, 30,) - -[logger_hpcloud-b3_ubuntu-trusty] -level=INFO -handlers=hpcloud-b3_ubuntu-trusty -qualname=nodepool.image.build.hpcloud-b3.ubuntu-trusty -propagate=0 - -[handler_hpcloud-b3_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.ubuntu-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b3_devstack-f21] level=INFO handlers=hpcloud-b3_devstack-f21 @@ -821,30 +593,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-centos7.log', 'H', 8, 30,) -[logger_hpcloud-b3_devstack-centos7-dib] -level=INFO -handlers=hpcloud-b3_devstack-centos7-dib -qualname=nodepool.image.build.hpcloud-b3.devstack-centos7-dib -propagate=0 - -[handler_hpcloud-b3_devstack-centos7-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-centos7-dib.log', 'H', 8, 30,) - -[logger_hpcloud-b3_devstack-fedora21-dib] -level=INFO -handlers=hpcloud-b3_devstack-fedora21-dib -qualname=nodepool.image.build.hpcloud-b3.devstack-fedora21-dib -propagate=0 - -[handler_hpcloud-b3_devstack-fedora21-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-fedora21-dib.log', 'H', 8, 30,) - [logger_hpcloud-b4_devstack-precise-check] level=INFO handlers=hpcloud-b4_devstack-precise-check @@ -857,18 +605,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-precise-check.log', 'H', 8, 30,) -[logger_hpcloud-b4_devstack-precise] -level=INFO -handlers=hpcloud-b4_devstack-precise -qualname=nodepool.image.build.hpcloud-b4.devstack-precise -propagate=0 - -[handler_hpcloud-b4_devstack-precise] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-precise.log', 'H', 8, 30,) - [logger_hpcloud-b4_bare-precise] level=INFO handlers=hpcloud-b4_bare-precise @@ -881,18 +617,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b4.bare-precise.log', 'H', 8, 30,) -[logger_hpcloud-b4_devstack-trusty] -level=INFO -handlers=hpcloud-b4_devstack-trusty -qualname=nodepool.image.build.hpcloud-b4.devstack-trusty -propagate=0 - -[handler_hpcloud-b4_devstack-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b4_bare-trusty] level=INFO handlers=hpcloud-b4_bare-trusty @@ -917,30 +641,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b4.bare-centos6.log', 'H', 8, 30,) -[logger_hpcloud-b4_centos-6] -level=INFO -handlers=hpcloud-b4_centos-6 -qualname=nodepool.image.build.hpcloud-b4.centos-6 -propagate=0 - -[handler_hpcloud-b4_centos-6] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.centos-6.log', 'H', 8, 30,) - -[logger_hpcloud-b4_ubuntu-trusty] -level=INFO -handlers=hpcloud-b4_ubuntu-trusty -qualname=nodepool.image.build.hpcloud-b4.ubuntu-trusty -propagate=0 - -[handler_hpcloud-b4_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.ubuntu-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b4_devstack-f21] level=INFO handlers=hpcloud-b4_devstack-f21 @@ -965,30 +665,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-centos7.log', 'H', 8, 30,) -[logger_hpcloud-b4_devstack-centos7-dib] -level=INFO -handlers=hpcloud-b4_devstack-centos7-dib -qualname=nodepool.image.build.hpcloud-b4.devstack-centos7-dib -propagate=0 - -[handler_hpcloud-b4_devstack-centos7-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-centos7-dib.log', 'H', 8, 30,) - -[logger_hpcloud-b4_devstack-fedora21-dib] -level=INFO -handlers=hpcloud-b4_devstack-fedora21-dib -qualname=nodepool.image.build.hpcloud-b4.devstack-fedora21-dib -propagate=0 - -[handler_hpcloud-b4_devstack-fedora21-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-fedora21-dib.log', 'H', 8, 30,) - [logger_hpcloud-b5_devstack-precise-check] level=INFO handlers=hpcloud-b5_devstack-precise-check @@ -1001,18 +677,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-precise-check.log', 'H', 8, 30,) -[logger_hpcloud-b5_devstack-precise] -level=INFO -handlers=hpcloud-b5_devstack-precise -qualname=nodepool.image.build.hpcloud-b5.devstack-precise -propagate=0 - -[handler_hpcloud-b5_devstack-precise] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-precise.log', 'H', 8, 30,) - [logger_hpcloud-b5_bare-precise] level=INFO handlers=hpcloud-b5_bare-precise @@ -1025,18 +689,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b5.bare-precise.log', 'H', 8, 30,) -[logger_hpcloud-b5_devstack-trusty] -level=INFO -handlers=hpcloud-b5_devstack-trusty -qualname=nodepool.image.build.hpcloud-b5.devstack-trusty -propagate=0 - -[handler_hpcloud-b5_devstack-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b5_bare-trusty] level=INFO handlers=hpcloud-b5_bare-trusty @@ -1061,30 +713,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b5.bare-centos6.log', 'H', 8, 30,) -[logger_hpcloud-b5_centos-6] -level=INFO -handlers=hpcloud-b5_centos-6 -qualname=nodepool.image.build.hpcloud-b5.centos-6 -propagate=0 - -[handler_hpcloud-b5_centos-6] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.centos-6.log', 'H', 8, 30,) - -[logger_hpcloud-b5_ubuntu-trusty] -level=INFO -handlers=hpcloud-b5_ubuntu-trusty -qualname=nodepool.image.build.hpcloud-b5.ubuntu-trusty -propagate=0 - -[handler_hpcloud-b5_ubuntu-trusty] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.ubuntu-trusty.log', 'H', 8, 30,) - [logger_hpcloud-b5_devstack-f21] level=INFO handlers=hpcloud-b5_devstack-f21 @@ -1109,30 +737,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-centos7.log', 'H', 8, 30,) -[logger_hpcloud-b5_devstack-centos7-dib] -level=INFO -handlers=hpcloud-b5_devstack-centos7-dib -qualname=nodepool.image.build.hpcloud-b5.devstack-centos7-dib -propagate=0 - -[handler_hpcloud-b5_devstack-centos7-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-centos7-dib.log', 'H', 8, 30,) - -[logger_hpcloud-b5_devstack-fedora21-dib] -level=INFO -handlers=hpcloud-b5_devstack-fedora21-dib -qualname=nodepool.image.build.hpcloud-b5.devstack-fedora21-dib -propagate=0 - -[handler_hpcloud-b5_devstack-fedora21-dib] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-fedora21-dib.log', 'H', 8, 30,) - [logger_tripleo-test-cloud-rh1_tripleo-precise] level=INFO handlers=tripleo-test-cloud-rh1_tripleo-precise diff --git a/tools/nodepool_log_config.py b/tools/nodepool_log_config.py index f2d41ba48f..e04c899975 100755 --- a/tools/nodepool_log_config.py +++ b/tools/nodepool_log_config.py @@ -124,7 +124,8 @@ def _get_providers_and_images(config_file): config = yaml.load(config_file) for provider in config['providers']: for image in provider['images']: - ret.append((provider['name'], image['name'])) + if 'diskimage' not in image: + ret.append((provider['name'], image['name'])) logging.debug("Added %d providers & images" % len(ret)) # diskimages have a special provider