Merge release branch into master branch [skip ci]

nubisproject · Feb 7, 2018 · 888265d · 888265d
2 parents 6070c0f + 8055aec
commit 888265d
Show file tree

Hide file tree

Showing 6 changed files with 3,462 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,23 @@
 # Change Log
 
+## [v2.1.0](https://github.com/nubisproject/nubis-base/tree/v2.1.0) (2018-02-07)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.1.0...v2.1.0)
+
+**Closed issues:**
+
+- Create a swap partition on boot [\#778](https://github.com/nubisproject/nubis-base/issues/778)
+
+**Merged pull requests:**
+
+- Handle swap creation for instances at boot time [\#779](https://github.com/nubisproject/nubis-base/pull/779) ([gozer](https://github.com/gozer))
+
 ## [v2.1.0](https://github.com/nubisproject/nubis-base/tree/v2.1.0) (2018-02-02)
 [Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.0.4...v2.1.0)
 
+**Implemented enhancements:**
+
+- Replace Amazon Linux with CentOS [\#154](https://github.com/nubisproject/nubis-base/issues/154)
+
 **Closed issues:**
 
 - Ensure nubis user \*always\* exists [\#771](https://github.com/nubisproject/nubis-base/issues/771)
@@ -11,9 +26,17 @@
 - Upgrade puppet-storage to 1.2.5 [\#768](https://github.com/nubisproject/nubis-base/issues/768)
 - Upgrade to nubis-puppet-nubis\_users 1.4.3 [\#766](https://github.com/nubisproject/nubis-base/issues/766)
 - Disable firewalld for centos host [\#765](https://github.com/nubisproject/nubis-base/issues/765)
+- Tag v2.1.0 release [\#775](https://github.com/nubisproject/nubis-base/issues/775)
+- \[node-collector\] Verify what data we are collecting [\#721](https://github.com/nubisproject/nubis-base/issues/721)
+- \[node-exporter\] Upgrade node-exporter to v0.15.0 [\#720](https://github.com/nubisproject/nubis-base/issues/720)
+- \[node\_exporter\] Expose nubis base version [\#704](https://github.com/nubisproject/nubis-base/issues/704)
+- /etc/profile.d/proxy.sh can sometimes \*not\* set PROXY\_\* variables at all [\#681](https://github.com/nubisproject/nubis-base/issues/681)
+- \[centos\] Disable SELinux [\#559](https://github.com/nubisproject/nubis-base/issues/559)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#777](https://github.com/nubisproject/nubis-base/pull/777) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#776](https://github.com/nubisproject/nubis-base/pull/776) ([nubis-automation](https://github.com/nubis-automation))
 - Final small update to using '@type' instead of the deprecated 'type' [\#774](https://github.com/nubisproject/nubis-base/pull/774) ([gozer](https://github.com/gozer))
 - Upgrade nubis-puppet-storage to v1.2.5 [\#773](https://github.com/nubisproject/nubis-base/pull/773) ([gozer](https://github.com/gozer))
 - Ensure we always create a nubis user [\#772](https://github.com/nubisproject/nubis-base/pull/772) ([gozer](https://github.com/gozer))
@@ -25,7 +48,6 @@
 **Implemented enhancements:**
 
 - \[puppet\] Include logrotate puppet module [\#724](https://github.com/nubisproject/nubis-base/issues/724)
-- Replace Amazon Linux with CentOS [\#154](https://github.com/nubisproject/nubis-base/issues/154)
 
 **Fixed bugs:**
 
@@ -46,11 +68,7 @@
 - \[apt\] Disable cronjob [\#736](https://github.com/nubisproject/nubis-base/issues/736)
 - \[puppet\] Upgrade nubis-discovery to v1.3.4 [\#732](https://github.com/nubisproject/nubis-base/issues/732)
 - \[prompt\] Add NUBIS\_ENVIRONMENT if present to the PS1 prompt [\#728](https://github.com/nubisproject/nubis-base/issues/728)
-- \[node-collector\] Verify what data we are collecting [\#721](https://github.com/nubisproject/nubis-base/issues/721)
-- \[node-exporter\] Upgrade node-exporter to v0.15.0 [\#720](https://github.com/nubisproject/nubis-base/issues/720)
 - \[duo\] Upgraded package available 1.10.0-0.el6 [\#687](https://github.com/nubisproject/nubis-base/issues/687)
-- /etc/profile.d/proxy.sh can sometimes \*not\* set PROXY\_\* variables at all [\#681](https://github.com/nubisproject/nubis-base/issues/681)
-- \[centos\] Disable SELinux [\#559](https://github.com/nubisproject/nubis-base/issues/559)
 - Tag v2.0.4 release [\#764](https://github.com/nubisproject/nubis-base/issues/764)
 - Tag v2.0.4 release [\#763](https://github.com/nubisproject/nubis-base/issues/763)
 - Tag v2.0.4 release [\#762](https://github.com/nubisproject/nubis-base/issues/762)
@@ -87,7 +105,6 @@
 
 **Closed issues:**
 
-- \[node\_exporter\] Expose nubis base version [\#704](https://github.com/nubisproject/nubis-base/issues/704)
 - Tag v2.0.2 release [\#729](https://github.com/nubisproject/nubis-base/issues/729)
 
 **Merged pull requests:**
@@ -825,7 +842,7 @@
 - Add support for 3 more Consul Server bootstrap options: [\#142](https://github.com/nubisproject/nubis-base/pull/142) ([gozer](https://github.com/gozer))
 
 ## [v0.9.0](https://github.com/nubisproject/nubis-base/tree/v0.9.0) (2015-07-23)
-[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.1...v0.9.0)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.79...v0.9.0)
 
 **Closed issues:**
 
@@ -841,11 +858,11 @@
 - Move creation of /etc/puppet/nubis/{files,templates} to base image. Fixes \#134 [\#135](https://github.com/nubisproject/nubis-base/pull/135) ([gozer](https://github.com/gozer))
 - Ubuntu repositories have very old versions of the ec2-ami-tools that just don't work at all. [\#130](https://github.com/nubisproject/nubis-base/pull/130) ([gozer](https://github.com/gozer))
 
-## [v0.1](https://github.com/nubisproject/nubis-base/tree/v0.1) (2015-06-11)
-[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.79...v0.1)
-
 ## [v0.79](https://github.com/nubisproject/nubis-base/tree/v0.79) (2015-06-11)
-[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v1.35...v0.79)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v0.1...v0.79)
+
+## [v0.1](https://github.com/nubisproject/nubis-base/tree/v0.1) (2015-06-11)
+[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v1.35...v0.1)
 
 **Closed issues:**
 

diff --git a/nubis/builder/artifacts/v2.1.0/v2.1.0/AMIs.json b/nubis/builder/artifacts/v2.1.0/v2.1.0/AMIs.json
@@ -0,0 +1,37 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1517612435,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-60e48e06,ap-northeast-2:ami-33e0425d,ap-southeast-1:ami-314a0d4d,ap-southeast-2:ami-fe25dd9c,eu-central-1:ami-6a29b305,eu-west-1:ami-93d5b9ea,sa-east-1:ami-b884cbd4,us-east-1:ami-9c1818e6,us-west-1:ami-ae040bce,us-west-2:ami-a57ec4dd",
+      "packer_run_uuid": "75a2ac87-70ef-5905-1df3-a700bb7b6c42"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1517613582,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-17e78d71,ap-northeast-2:ami-49e24027,ap-southeast-1:ami-2c490e50,ap-southeast-2:ami-c224dca0,eu-central-1:ami-2a2fb545,eu-west-1:ami-38d7bb41,sa-east-1:ami-3683cc5a,us-east-1:ami-1b202061,us-west-1:ami-06050a66,us-west-2:ami-4a78c232",
+      "packer_run_uuid": "75a2ac87-70ef-5905-1df3-a700bb7b6c42"
+    },
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1518030788,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-66bacc00,ap-northeast-2:ami-d2aa08bc,ap-southeast-1:ami-07b7f67b,ap-southeast-2:ami-dd10ebbf,eu-central-1:ami-0cb9dd63,eu-west-1:ami-eae58d93,sa-east-1:ami-f7357b9b,us-east-1:ami-edd1d997,us-west-1:ami-de535dbe,us-west-2:ami-668d0a1e",
+      "packer_run_uuid": "f48d80f4-fa77-135a-51fd-7847ef54860e"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1518030898,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-33a6d055,ap-northeast-2:ami-c1aa08af,ap-southeast-1:ami-a6b6f7da,ap-southeast-2:ami-8313e8e1,eu-central-1:ami-d0bbdfbf,eu-west-1:ami-98e68ee1,sa-east-1:ami-2c377940,us-east-1:ami-77e8e00d,us-west-1:ami-26515f46,us-west-2:ami-89890ef1",
+      "packer_run_uuid": "f48d80f4-fa77-135a-51fd-7847ef54860e"
+    }
+  ],
+  "last_run_uuid": "f48d80f4-fa77-135a-51fd-7847ef54860e"
+}