Switched node pkgsrc and base-64-es image to 2017Q4

Closes #111

ansible/group_vars/build/base.yml

@@ -38,8 +38,8 @@ builder_base_centos_imgfile: base-centos-7-latest.zfs.gz
 builder_base_centos_imgmanifest_url: "{{ builder.appliance.url }}/base-centos-7/{{ builder_base_centos_imgmanifest }}"
 builder_base_centos_imgfile_url: "{{ builder.appliance.url }}/base-centos-7/{{ builder_base_centos_imgfile }}"
 
-pkgsrc_version: 16.4.1
-pkgin_release: 2016Q4
+pkgsrc_version: 17.4.0
+pkgin_release: 2017Q4
 builder_base_zone_imgmanifest: "base-64-es-{{ pkgsrc_version }}.imgmanifest"
 builder_base_zone_imgfile: "base-64-es-{{ pkgsrc_version }}.zfs.gz"
 builder_base_zone_imgmanifest_url: "{{ builder.appliance.url }}/base-64-es/{{ builder_base_zone_imgmanifest }}"

ansible/group_vars/build/usb-deps.yml

@@ -1,26 +1,26 @@
 builder_platform_url: 'http://download.erigones.org/esdc/factory/platform'
 builder_platform:
   - name: 'boot'
-    version: '20171216T012846Z'
+    version: '20180105T193033Z'
     desc: 'SmartOS grub boot loader'
     link: 'boot-latest'
   - name: 'platform'
-    version: '20171216T012846Z'
+    version: '20180105T193033Z'
     desc: 'SmartOS kernel and boot_archive'
     link: 'platform-latest'
 
 builder_archives_url: 'http://download.erigones.org/esdc/factory/archives'
 builder_archives:
   - name: 'monitoring'
-    version: '2016Q4-20180103'
+    version: '2017Q4-20180112'
     desc: '/opt/zabbix directory on hypervisor'
     link: 'monitoring-latest'
   - name: 'local'
-    version: '2016Q4-20180103'
+    version: '2017Q4-20180112'
     desc: '/opt/local directory on hypervisor'
     link: 'local-latest'
   - name: 'opt-custom'
-    version: '2016Q4-20180103'
+    version: '2017Q4-20180112'
     desc: '/opt/custom directory on hypervisor'
     link: 'opt-custom-latest'
 

ansible/host_vars/builder/usb-image.yml

@@ -5,7 +5,7 @@ usb_tmp_image: "{{ usb_tmp_dir }}/esdc-usb.img"
 usb_type: "hn"  # "hn" or "cn"
 usb_root_pw: "$5$2HOHRnK3$NvLlm.1KQBbB0WjoP7xcIwGnllhzp2HnT.mDO7DpxYA"  # root
 
-platform_version: "20171216T012846Z"
+platform_version: "20180105T193033Z"
 platform_os_archive: "{{ builder.platform.dir }}/platform-{{ platform_version }}.tgz"
 platform_boot_archive: "{{ builder.platform.dir }}/boot-{{ platform_version }}.tgz"
 

ansible/vars/build/vm/base-64-es.yml

@@ -7,7 +7,7 @@ builder_dir: "{{ builder.appliance.dir }}/base-64-es"
 zone_brand: joyent
 zone_dns_domain: local
 zone_uuid: b442c858-f254-4a1f-a4f5-8fce46913ca6
-zone_image_uuid: 1f32508c-e6e9-11e6-bc05-8fea9e979940 # base-64-lts 16.4.1
+zone_image_uuid: 390639d4-f146-11e7-9280-37ae5c6d53d4 # base-64-lts 17.4.0
 zone_hostname: "{{ image_name }}"
 zone_nic_0_ip: "{{ build_ips.base64 | default(build_ip) }}"
 zone_delegate_dataset: false

docs/appliances.rst

@@ -28,7 +28,7 @@ Changelog
 3.0.0
 ~~~~~
 
-- Version bump.
+- Updated pkgsrc in /opt/local to 2017Q4 - `#111 <https://github.com/erigones/esdc-factory/issues/111>`__
 
 2.6.7
 ~~~~~
@@ -140,6 +140,7 @@ Changelog
 3.0.0
 ~~~~~
 
+- Built from new `base-64-es`_ with 2017Q4 pkgsrc - `#111 <https://github.com/erigones/esdc-factory/issues/111>`__
 - Added ZooKeeper REST service - `#108 <https://github.com/erigones/esdc-factory/issues/108>`__
 - Added ``cfgdb_zk_rest_ssl_{cert,key}`` metadata and updated related post-deploy configuration script - `#102 <https://github.com/erigones/esdc-factory/issues/102>`__
 
@@ -252,7 +253,7 @@ Changelog
 3.0.0
 ~~~~~
 
-- Version bump.
+- Built from new `base-64-es`_ with 2017Q4 pkgsrc - `#111 <https://github.com/erigones/esdc-factory/issues/111>`__
 
 2.6.7
 ~~~~~
@@ -357,7 +358,7 @@ Changelog
 3.0.0
 ~~~~~
 
-- Version bump.
+- Built from new `base-64-es`_ with 2017Q4 pkgsrc - `#111 <https://github.com/erigones/esdc-factory/issues/111>`__
 
 2.6.7
 ~~~~~

docs/usb-image.rst

@@ -23,7 +23,7 @@ Changelog
 =====
 Unreleased
 
-- Updated to a new platform version - 20171216T012846Z from upstream/release-20171221:
+- Updated to a new platform version - 20180105T193033Z from upstream/release-20180104:
     - Added support for the ``dns_options`` /usbkey/config setting - `erigonos-overlay#1 <https://github.com/erigones/esdc-erigonos-overlay/issues/1>`__
     - Added support for admin NIC tag on etherstub - `#86 <https://github.com/erigones/esdc-factory/issues/86>`__
     - Added support for the ``vnc_listen_address`` in /usbkey/config - `#88 <https://github.com/erigones/esdc-factory/issues/88>`__
@@ -34,12 +34,13 @@ Unreleased
     - Increased "/" (root) ramdisk size `smartos-live/commit 8a490b6 <https://github.com/erigones/smartos-live/commit/8a490b6e42279a64e60a097a2dbed0740209dc8c>`__
     - Fixed node.js fs.readFile[Sync]() problem with reading /dev/stdin - `joyent/smartos-live#753 <https://github.com/joyent/smartos-live/issues/753>`__
 
-- Updated *local* archive [local-2016Q4-20180103]
+- Updated *local* archive [local-2017Q4-20180112]
+    - Changed pkgsrc version to 2017Q4 - `#111 <https://github.com/erigones/esdc-factory/issues/111>`__
 
-- Updated *monitoring* archive [local-2016Q4-20180103]:
+- Updated *monitoring* archive [local-2017Q4-20180112]:
     - Updated Zabbix agent to 3.0.14 - `#110 <https://github.com/erigones/esdc-factory/issues/110>`__
 
-- Updated *opt-custom* archive [opt-custom-2016Q4-20180103]:
+- Updated *opt-custom* archive [opt-custom-2017Q4-20180112]:
     - Added support for custom postboot SMF user scripts - `#89 <https://github.com/erigones/esdc-factory/issues/89>`__
     - Added sample firewall and mount-iscsi RC scripts - `#89 <https://github.com/erigones/esdc-factory/issues/89>`__
     - Added ipsec RC script - `#107 <https://github.com/erigones/esdc-factory/issues/107>`__