svn commit: r331363 - in stable: 10/release/tools 11/release/tools

[Glen Barber]

Author: gjb
Date: Thu Mar 22 17:46:38 2018
New Revision: 331363
URL: https://svnweb.freebsd.org/changeset/base/331363

Log:
  MFC r322794:
   Use py-google-compute-engine instead for releasing Google Compute
   Engine (GCE) images with an updated version of Google's tools.
  
  PR:		221714
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/tools/gce.conf
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/tools/gce.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/tools/gce.conf
==============================================================================
--- stable/11/release/tools/gce.conf	Thu Mar 22 15:34:37 2018	(r331362)
+++ stable/11/release/tools/gce.conf	Thu Mar 22 17:46:38 2018	(r331363)
@@ -5,12 +5,15 @@
 
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
-	google-cloud-sdk google-daemon panicmail sudo firstboot-growfs \
-	google-startup-scripts"
+	google-cloud-sdk panicmail sudo firstboot-growfs \
+	sysutils/py-google-compute-engine"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \
-	firstboot_pkgs firstboot_freebsd_update google_startup"
+	firstboot_pkgs firstboot_freebsd_update google_startup \
+	google_accounts_daemon google_clock_skew_daemon
+	google_instance_setup google_ip_forwarding_daemon
+	google_network_setup"
 
 vm_extra_install_base() {
 	echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf