From 6f26bc0b6aa00ad4524b735b07cc7070265a7262 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 2 May 2015 18:32:24 -0400 Subject: [PATCH] Start building ubuntu-trusty nodes As the next step in dib-nodepool, start making nodes called ubuntu-trusty based on the ubuntu-minimal element which is now in diskiamge-builder 0.1.44. No jobs should be targetted at this label yet, however, it is named with the new naming in mind, $distro-$release. Once these exist, we should be able to start aiming some experimental devstack jobs at them to make sure that nothing is missing. Change-Id: I75838d89b6ad7271d8022abbaa0aa4cca3e16525 --- .../nodepool/nodepool.logging.conf.erb | 76 ++++++++++++++++++- .../templates/nodepool/nodepool.yaml.erb | 47 ++++++++++++ 2 files changed, 121 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 3112ecf887..dbe9229b39 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_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,dib_centos-6,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_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,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_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,dib_centos-6,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_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,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib [formatters] keys=simple @@ -461,6 +461,18 @@ 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 @@ -593,6 +605,18 @@ 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 @@ -725,6 +749,18 @@ 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 @@ -857,6 +893,18 @@ 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 @@ -989,6 +1037,18 @@ 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 @@ -1073,6 +1133,18 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @image_log_document_root %>/dib.centos-6.log', 'H', 8, 30,) +[logger_dib_ubuntu-trusty] +level=INFO +handlers=dib_ubuntu-trusty +qualname=nodepool.image.build.ubuntu-trusty +propagate=0 + +[handler_dib_ubuntu-trusty] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=simple +args=('<%= @image_log_document_root %>/dib.ubuntu-trusty.log', 'H', 8, 30,) + [logger_dib_devstack-trusty] level=INFO handlers=dib_devstack-trusty diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 9a8f4688e0..0db78a5f43 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -116,6 +116,16 @@ labels: - name: rax-dfw - name: rax-ord - name: rax-iad + - name: ubuntu-trusty + image: ubuntu-trusty + 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: devstack-trusty-2-node image: devstack-trusty ready-script: multinode_setup.sh @@ -490,6 +500,11 @@ providers: diskimage: centos-6 username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + 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 @@ -569,6 +584,11 @@ providers: diskimage: centos-6 username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + 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 @@ -647,6 +667,11 @@ providers: diskimage: centos-6 username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + 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 @@ -726,6 +751,11 @@ providers: diskimage: centos-6 username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + 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 @@ -806,6 +836,11 @@ providers: diskimage: centos-6 username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + 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 @@ -913,6 +948,18 @@ diskimages: env-vars: TMPDIR: /opt/dib_tmp DIB_IMAGE_CACHE: /opt/dib_cache + - name: ubuntu-trusty + elements: + - ubuntu-minimal + - vm + - openstack-repos + - puppet + - nodepool-base + - node-devstack + release: trusty + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache - name: devstack-trusty elements: - ubuntu