Merge release branch into master branch [skip ci]

nubisproject · Aug 1, 2018 · 8ae126f · 8ae126f
2 parents 88204ae + 055c946
commit 8ae126f
Show file tree

Hide file tree

Showing 9 changed files with 3,505 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [v2.3.0](https://github.com/nubisproject/nubis-base/tree/v2.3.0) (2018-08-01)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.3.0...v2.3.0)
+
+**Merged pull requests:**
+
+- Add a timeout waiting for userdata file [\#874](https://github.com/nubisproject/nubis-base/pull/874) ([tinnightcap](https://github.com/tinnightcap))
+- Wait for cloud-init to create userdata file [\#873](https://github.com/nubisproject/nubis-base/pull/873) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v2.3.0](https://github.com/nubisproject/nubis-base/tree/v2.3.0) (2018-07-27)
 [Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.2.0...v2.3.0)
 
@@ -22,6 +30,7 @@
 - Use nubis-metadata instead of AWS user-data directly [\#803](https://github.com/nubisproject/nubis-base/issues/803)
 - \[nubis-metadata\] Stop querying AWS metadata [\#801](https://github.com/nubisproject/nubis-base/issues/801)
 - Tag v2.2.0 release [\#798](https://github.com/nubisproject/nubis-base/issues/798)
+- Tag v2.3.0 release [\#870](https://github.com/nubisproject/nubis-base/issues/870)
 - Tag v2.3.0 release [\#867](https://github.com/nubisproject/nubis-base/issues/867)
 - Tag v2.3.0 release [\#845](https://github.com/nubisproject/nubis-base/issues/845)
 - Tag v2.3.0 release [\#838](https://github.com/nubisproject/nubis-base/issues/838)
@@ -34,6 +43,8 @@
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#872](https://github.com/nubisproject/nubis-base/pull/872) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#871](https://github.com/nubisproject/nubis-base/pull/871) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.3.0 release \[skip ci\] [\#869](https://github.com/nubisproject/nubis-base/pull/869) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.3.0 release \[skip ci\] [\#868](https://github.com/nubisproject/nubis-base/pull/868) ([nubis-automation](https://github.com/nubis-automation))
 - Add back %%PURPOSE%% %%STACK%% %%ENVIRONMENT%% substitution to /etc/consul/\* [\#866](https://github.com/nubisproject/nubis-base/pull/866) ([gozer](https://github.com/gozer))

diff --git a/nubis/builder/artifacts/v2.3.0/v2.3.0/AMIs.json b/nubis/builder/artifacts/v2.3.0/v2.3.0/AMIs.json
@@ -19,19 +19,19 @@
     {
       "name": "amazon-ebs-ubuntu",
       "builder_type": "amazon-ebs",
-      "build_time": 1532711708,
+      "build_time": 1533130989,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-2ea0d6c3,ap-northeast-2:ami-b641f6d8,ap-southeast-1:ami-b86a2b52,ap-southeast-2:ami-5452f436,eu-central-1:ami-30989adb,eu-west-1:ami-da4aaf37,sa-east-1:ami-efdeff83,us-east-1:ami-ad2e26d2,us-west-1:ami-46b35f25,us-west-2:ami-72ebb30a",
-      "packer_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
+      "artifact_id": "ap-northeast-1:ami-315221dc,ap-northeast-2:ami-060b7dae9b5e8136a,ap-southeast-1:ami-ef713205,ap-southeast-2:ami-104aeb72,eu-central-1:ami-f4e5e81f,eu-west-1:ami-829c7d6f,sa-east-1:ami-09b85bdf4787bdd33,us-east-1:ami-c51202ba,us-west-1:ami-1d75997e,us-west-2:ami-b97356c1",
+      "packer_run_uuid": "fc88ea78-4131-3c50-8024-588ddcc25479"
     },
     {
       "name": "amazon-ebs-centos",
       "builder_type": "amazon-ebs",
-      "build_time": 1532712038,
+      "build_time": 1533131349,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-1eaadcf3,ap-northeast-2:ami-bb4ef9d5,ap-southeast-1:ami-9166277b,ap-southeast-2:ami-9d52f4ff,eu-central-1:ami-ea9a9801,eu-west-1:ami-b34aaf5e,sa-east-1:ami-2ba18047,us-east-1:ami-162e2669,us-west-1:ami-a0ba56c3,us-west-2:ami-46eeb63e",
-      "packer_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
+      "artifact_id": "ap-northeast-1:ami-3ba9dad6,ap-northeast-2:ami-0d784c6e936be082d,ap-southeast-1:ami-fc5c1f16,ap-southeast-2:ami-b94aebdb,eu-central-1:ami-b6e4e95d,eu-west-1:ami-51cd2cbc,sa-east-1:ami-06a9f3bf280393ea6,us-east-1:ami-c01101bf,us-west-1:ami-5e75993d,us-west-2:ami-01725779",
+      "packer_run_uuid": "fc88ea78-4131-3c50-8024-588ddcc25479"
     }
   ],
-  "last_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
+  "last_run_uuid": "fc88ea78-4131-3c50-8024-588ddcc25479"
 }
diff --git a/nubis/builder/artifacts/v2.3.0/v2.3.0/amazon-ebs-centos-packages.pp b/nubis/builder/artifacts/v2.3.0/v2.3.0/amazon-ebs-centos-packages.pp
@@ -89,10 +89,10 @@
   ensure => '2.45.0',
 }
 package { 'boto3':
-  ensure => '1.7.65',
+  ensure => '1.7.67',
 }
 package { 'botocore':
-  ensure => '1.10.65',
+  ensure => '1.10.67',
 }
 package { 'btrfs-progs':
   ensure => '4.9.1-1.el7',

diff --git a/nubis/builder/artifacts/v2.3.0/v2.3.0/amazon-ebs-ubuntu-packages.pp b/nubis/builder/artifacts/v2.3.0/v2.3.0/amazon-ebs-ubuntu-packages.pp
@@ -62,10 +62,10 @@
   ensure => '2.26.1-1ubuntu1~16.04.6',
 }
 package { 'boto3':
-  ensure => '1.7.65',
+  ensure => '1.7.67',
 }
 package { 'botocore':
-  ensure => '1.10.65',
+  ensure => '1.10.67',
 }
 package { 'bsd-mailx':
   ensure => '8.1.2-0.20160123cvs-2',
@@ -896,7 +896,7 @@
   ensure => '2.0.11-1ubuntu1.1',
 }
 package { 'libonig2':
-  ensure => '5.9.6-1',
+  ensure => '5.9.6-1ubuntu0.1',
 }
 package { 'libopts25':
   ensure => '1:5.18.7-3',
@@ -914,7 +914,7 @@
   ensure => '1.1.8-3.2ubuntu2.1',
 }
 package { 'libpam-systemd':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'libpam0g':
   ensure => '1.1.8-3.2ubuntu2.1',
@@ -1064,7 +1064,7 @@
   ensure => '5.4.0-6ubuntu1~16.04.10',
 }
 package { 'libsystemd0':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'libtasn1-6':
   ensure => '4.7-3ubuntu0.16.04.3',
@@ -1091,7 +1091,7 @@
   ensure => '5.4.0-6ubuntu1~16.04.10',
 }
 package { 'libudev1':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'libusb-0.1-4':
   ensure => '2:0.1.12-28',
@@ -1162,27 +1162,18 @@
 package { 'linux-aws':
   ensure => '4.4.0.1063.65',
 }
-package { 'linux-aws-headers-4.4.0-1061':
-  ensure => '4.4.0-1061.70',
-}
 package { 'linux-aws-headers-4.4.0-1063':
   ensure => '4.4.0-1063.72',
 }
 package { 'linux-base':
   ensure => '4.5ubuntu1~16.04.1',
 }
-package { 'linux-headers-4.4.0-1061-aws':
-  ensure => '4.4.0-1061.70',
-}
 package { 'linux-headers-4.4.0-1063-aws':
   ensure => '4.4.0-1063.72',
 }
 package { 'linux-headers-aws':
   ensure => '4.4.0.1063.65',
 }
-package { 'linux-image-4.4.0-1061-aws':
-  ensure => '4.4.0-1061.70',
-}
 package { 'linux-image-4.4.0-1063-aws':
   ensure => '4.4.0-1063.72',
 }
@@ -1754,10 +1745,10 @@
   ensure => '1.8.16-0ubuntu1.5',
 }
 package { 'systemd':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'systemd-sysv':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'sysv-rc':
   ensure => '2.88dsf-59.3ubuntu2',
@@ -1817,7 +1808,7 @@
   ensure => '3.0036',
 }
 package { 'udev':
-  ensure => '229-4ubuntu21.2',
+  ensure => '229-4ubuntu21.4',
 }
 package { 'ufw':
   ensure => '0.35-0ubuntu2',

diff --git a/nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/AMIs.json b/nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/AMIs.json
@@ -19,19 +19,19 @@
     {
       "name": "amazon-ebs-ubuntu",
       "builder_type": "amazon-ebs",
-      "build_time": 1532706968,
+      "build_time": 1532711708,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-064a3ceb,ap-northeast-2:ami-4943f427,ap-southeast-1:ami-105a1bfa,ap-southeast-2:ami-fb56f099,eu-central-1:ami-d794963c,eu-west-1:ami-bd7b9e50,sa-east-1:ami-8bdffee7,us-east-1:ami-e01b139f,us-west-1:ami-f0b55993,us-west-2:ami-27f6ae5f",
-      "packer_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+      "artifact_id": "ap-northeast-1:ami-2ea0d6c3,ap-northeast-2:ami-b641f6d8,ap-southeast-1:ami-b86a2b52,ap-southeast-2:ami-5452f436,eu-central-1:ami-30989adb,eu-west-1:ami-da4aaf37,sa-east-1:ami-efdeff83,us-east-1:ami-ad2e26d2,us-west-1:ami-46b35f25,us-west-2:ami-72ebb30a",
+      "packer_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
     },
     {
       "name": "amazon-ebs-centos",
       "builder_type": "amazon-ebs",
-      "build_time": 1532707217,
+      "build_time": 1532712038,
       "files": null,
-      "artifact_id": "ap-northeast-1:ami-c04c3a2d,ap-northeast-2:ami-2b4ff845,ap-southeast-1:ami-785e1f92,ap-southeast-2:ami-5255f330,eu-central-1:ami-e195970a,eu-west-1:ami-3d0fead0,sa-east-1:ami-08dbfa64,us-east-1:ami-891b13f6,us-west-1:ami-ca8c60a9,us-west-2:ami-ecf7af94",
-      "packer_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+      "artifact_id": "ap-northeast-1:ami-1eaadcf3,ap-northeast-2:ami-bb4ef9d5,ap-southeast-1:ami-9166277b,ap-southeast-2:ami-9d52f4ff,eu-central-1:ami-ea9a9801,eu-west-1:ami-b34aaf5e,sa-east-1:ami-2ba18047,us-east-1:ami-162e2669,us-west-1:ami-a0ba56c3,us-west-2:ami-46eeb63e",
+      "packer_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
     }
   ],
-  "last_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+  "last_run_uuid": "1d2ca9e6-58e9-e0f3-3d42-69c21267db87"
 }
diff --git a/nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/v2.3.0/AMIs.json b/nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/v2.3.0/AMIs.json
@@ -0,0 +1,37 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1531841439,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-114826fc,ap-northeast-2:ami-b6d364d8,ap-southeast-1:ami-cda6dc27,ap-southeast-2:ami-8570d4e7,eu-central-1:ami-7bb5b390,eu-west-1:ami-44dcc3ae,sa-east-1:ami-6e113702,us-east-1:ami-9e8bb2e1,us-west-1:ami-af20c2cc,us-west-2:ami-a6ecb1de",
+      "packer_run_uuid": "286ed8a0-a88d-746d-7eb1-12be91913906"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1531841804,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-d647293b,ap-northeast-2:ami-5dd66133,ap-southeast-1:ami-b8a6dc52,ap-southeast-2:ami-db72d6b9,eu-central-1:ami-fba9af10,eu-west-1:ami-5fddc2b5,sa-east-1:ami-481d3b24,us-east-1:ami-cf8bb2b0,us-west-1:ami-5a28ca39,us-west-2:ami-a9efb2d1",
+      "packer_run_uuid": "286ed8a0-a88d-746d-7eb1-12be91913906"
+    },
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1532706968,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-064a3ceb,ap-northeast-2:ami-4943f427,ap-southeast-1:ami-105a1bfa,ap-southeast-2:ami-fb56f099,eu-central-1:ami-d794963c,eu-west-1:ami-bd7b9e50,sa-east-1:ami-8bdffee7,us-east-1:ami-e01b139f,us-west-1:ami-f0b55993,us-west-2:ami-27f6ae5f",
+      "packer_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1532707217,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-c04c3a2d,ap-northeast-2:ami-2b4ff845,ap-southeast-1:ami-785e1f92,ap-southeast-2:ami-5255f330,eu-central-1:ami-e195970a,eu-west-1:ami-3d0fead0,sa-east-1:ami-08dbfa64,us-east-1:ami-891b13f6,us-west-1:ami-ca8c60a9,us-west-2:ami-ecf7af94",
+      "packer_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+    }
+  ],
+  "last_run_uuid": "e99e6e8c-503f-a2b1-5727-d167c118f5df"
+}