From ca10afe8246c3446a03c2a4f9429a032778a79e1 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 6 Apr 2015 19:05:36 +0000 Subject: [PATCH] Add a centos-6 node label These are the "centos6" corollary to devstack-.* node labels, but we're not likely to run DevStack on them. Avoid confusion by going ahead and using the new platform naming pattern settled on in the 2015-03-31 Infra meeting. http://eavesdrop.openstack.org/meetings/infra/2015/infra.2015-03-31-19.00.html Also update the nodepool logging config to get it back in sync with reality. Change-Id: Ie629b6b8e8f2401e3769a7b2c54844d950d9fd60 --- .../nodepool/nodepool.logging.conf.erb | 100 +++++++++++++++++- .../templates/nodepool/nodepool.yaml.erb | 70 ++++++++++++ 2 files changed, 168 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb index c0c78f91d6..51b272a215 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_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_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_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_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_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_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_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_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 +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_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,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_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_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_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_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 [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_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_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_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_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_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_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_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_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 +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_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_centos-6,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_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_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_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_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 [formatters] keys=simple @@ -125,6 +125,18 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-dfw.bare-centos6.log', 'H', 8, 30,) +[logger_rax-dfw_centos-6] +level=INFO +handlers=rax-dfw_centos-6 +qualname=nodepool.image.build.rax-dfw.centos-6 +propagate=0 + +[handler_rax-dfw_centos-6] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('<%= @image_log_document_root %>/rax-dfw.centos-6.log', 'H', 8, 30,) + [logger_rax-dfw_devstack-f21] level=INFO handlers=rax-dfw_devstack-f21 @@ -209,6 +221,18 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-ord.bare-centos6.log', 'H', 8, 30,) +[logger_rax-ord_centos-6] +level=INFO +handlers=rax-ord_centos-6 +qualname=nodepool.image.build.rax-ord.centos-6 +propagate=0 + +[handler_rax-ord_centos-6] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('<%= @image_log_document_root %>/rax-ord.centos-6.log', 'H', 8, 30,) + [logger_rax-ord_devstack-f21] level=INFO handlers=rax-ord_devstack-f21 @@ -293,6 +317,18 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/rax-iad.bare-centos6.log', 'H', 8, 30,) +[logger_rax-iad_centos-6] +level=INFO +handlers=rax-iad_centos-6 +qualname=nodepool.image.build.rax-iad.centos-6 +propagate=0 + +[handler_rax-iad_centos-6] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('<%= @image_log_document_root %>/rax-iad.centos-6.log', 'H', 8, 30,) + [logger_rax-iad_devstack-precise-check] level=INFO handlers=rax-iad_devstack-precise-check @@ -413,6 +449,18 @@ 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_devstack-f21] level=INFO handlers=hpcloud-b1_devstack-f21 @@ -533,6 +581,18 @@ 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_devstack-f21] level=INFO handlers=hpcloud-b2_devstack-f21 @@ -653,6 +713,18 @@ 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_devstack-f21] level=INFO handlers=hpcloud-b3_devstack-f21 @@ -773,6 +845,18 @@ 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_devstack-f21] level=INFO handlers=hpcloud-b4_devstack-f21 @@ -893,6 +977,18 @@ 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_devstack-f21] level=INFO handlers=hpcloud-b5_devstack-f21 diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 706845e4d3..9a8f4688e0 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -103,6 +103,19 @@ labels: - name: rax-dfw - name: rax-ord - name: rax-iad + - name: centos-6 + image: centos-6 + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad - name: devstack-trusty-2-node image: devstack-trusty ready-script: multinode_setup.sh @@ -237,6 +250,13 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 (PVHVM)' min-ram: 8192 @@ -299,6 +319,13 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 (PVHVM)' min-ram: 8192 @@ -361,6 +388,13 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-precise-check base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' min-ram: 8192 @@ -451,6 +485,11 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' min-ram: 30720 @@ -525,6 +564,11 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' min-ram: 30720 @@ -598,6 +642,11 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' min-ram: 30720 @@ -672,6 +721,11 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' min-ram: 30720 @@ -747,6 +801,11 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f21 base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' min-ram: 30720 @@ -843,6 +902,17 @@ targets: credentials-id: '<%= jenkins_credentials_id %>' diskimages: + - name: centos-6 + elements: + - centos + - vm + - openstack-repos + - puppet + - nodepool-base + - node-devstack + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache - name: devstack-trusty elements: - ubuntu