Bug 221714 - release: use py-google-compute-engine in GCE image release
Summary: release: use py-google-compute-engine in GCE image release
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: conf (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Some People
Assignee: Glen Barber
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-08-22 15:07 UTC by Helen Koike
Modified: 2018-03-26 14:14 UTC (History)
3 users (show)

See Also:


Attachments
Patch adding py-google-compute-engine package in gce release (971 bytes, patch)
2017-08-22 15:07 UTC, Helen Koike
no flags Details | Diff
Patch adding py-google-compute-engine package in gce release (942 bytes, patch)
2017-08-22 15:11 UTC, Helen Koike
no flags Details | Diff
Patch removing google_accounts_manager from VM_RC_LIST (829 bytes, patch)
2017-09-25 14:03 UTC, Helen Koike
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Helen Koike 2017-08-22 15:07:05 UTC
Created attachment 185661 [details]
Patch adding py-google-compute-engine package in gce release

google-daemon and google-startup-scripts are the legacy version of the compute-image-packages project, use py-google-compute-engine instead for releasing Google Compute Engine (GCE) images with an updated version of the Google's tools.

Please, see attached patch.
Comment 1 Helen Koike 2017-08-22 15:11:42 UTC
Created attachment 185663 [details]
Patch adding py-google-compute-engine package in gce release
Comment 2 Glen Barber freebsd_committer freebsd_triage 2017-08-22 15:24:27 UTC
There is one slight problem with this change - the 'py-' prefix in the package name.

The package that gets installed will be named 'py27-google-startup-scripts', so as-is, which we would then need to keep the package name in release/tools/gce.conf updated to reflect whatever the latest python version is.

Alternatively, as you are the port maintainer, would you be willing to rename the port to remove the 'py-' prefix?  I think the latter would be the least resistant way to handle this.
Comment 3 Glen Barber freebsd_committer freebsd_triage 2017-08-22 15:27:05 UTC
Actually, this can be worked around by including the 'sysutils' category prefix to the VM_EXTRA_PACKAGES entry.  However, I will wait until you respond regarding renaming the port.
Comment 4 Glen Barber freebsd_committer freebsd_triage 2017-08-22 15:33:59 UTC
(In reply to Glen Barber from comment #3)
> Actually, this can be worked around by including the 'sysutils' category
> prefix to the VM_EXTRA_PACKAGES entry.  However, I will wait until you
> respond regarding renaming the port.

On second thought, I'll commit the change now, and we can revisit this if needed.
Comment 5 commit-hook freebsd_committer freebsd_triage 2017-08-22 15:35:23 UTC
A commit references this bug:

Author: gjb
Date: Tue Aug 22 15:34:27 UTC 2017
New revision: 322794
URL: https://svnweb.freebsd.org/changeset/base/322794

Log:
  Use py-google-compute-engine instead for releasing Google Compute
  Engine (GCE) images with an updated version of Google's tools.

  PR:		221714
  Submitted by:	helen _dot_ koike _@_ collabora_dot_com (original)
  MFC after:	5 days
  Sponsored by:	The FreeBSD Foundation

Changes:
  head/release/tools/gce.conf
Comment 6 Sylvain Garrigues 2017-08-23 13:32:42 UTC
Regarding revision 322794, just noticed that:
1/ there is no sysutils/py-google-compute-engine package although it is added to first packages - have to build it from ports
2/ there is no /usr/local/etc/rc.d/google_ip_forwarding_daemon although it is added to rc.conf on startup
Comment 7 Glen Barber freebsd_committer freebsd_triage 2017-08-23 13:46:02 UTC
For (1), are you using the 'quarterly' branch?

For (2), I'll double-check this.  Thank you for the report.
Comment 8 Glen Barber freebsd_committer freebsd_triage 2017-08-23 13:47:42 UTC
(In reply to Glen Barber from comment #7)
> For (1), are you using the 'quarterly' branch?
> 
> For (2), I'll double-check this.  Thank you for the report.

(2) seems to be due to google_ip_forwarding_daemon missing from USE_RC_SUBR.

Helen, could you please take a look at the port and confirm this is being installed?
Comment 9 Sylvain Garrigues 2017-08-23 13:48:08 UTC
(In reply to Glen Barber from comment #7)
Not sure: just did
# portsnap fetch extract update 
on my 12-CURRENT amd64 recompiled this morning.
Comment 10 Glen Barber freebsd_committer freebsd_triage 2017-08-23 13:53:18 UTC
Testing on a 10.4-BETA1 machine, I do see the package is on the mirrors.

root@beta:~ # pkg search sysutils/py-google-compute-engine
sysutils/py-google-compute-engine Guest Environment for Google Compute Engine

I'll do some more poking around.
Comment 11 Glen Barber freebsd_committer freebsd_triage 2017-08-23 14:28:26 UTC
(In reply to Glen Barber from comment #7)
> For (1), are you using the 'quarterly' branch?
> 

For (1), the 12-CURRENT packages are still being built.  This package should be available on the mirrors upon completion.

https://pkg-status.freebsd.org/
Comment 12 Helen Koike 2017-08-29 18:56:24 UTC
Sorry for my delay to reply

(2) I sent a patch adding the missing script in USE_RC_SUBR https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221917
Comment 13 Vick Khera 2017-09-08 18:25:04 UTC
On a test system, I removed the google-daemon and google-accounts-manager packages, and installed the py-google-compute-engine package from Latest package build, so the resulting system should look like what will be built by this release config.

The resulting system does not have the rc script for google_accounts_manager, which is still specified in VM_RC_LIST. It seems to me that it should be removed from the VM_RC_LIST.


Also, if you could please look at bug #222089 I outline a handful of other things that make for a slightly broken and sub-optimal VM image for GCE.
Comment 14 Helen Koike 2017-09-25 12:54:12 UTC
(In reply to Vick Khera from comment #13)

> The resulting system does not have the rc script for google_accounts_manager, which is still specified in VM_RC_LIST. It seems to me that it should be removed from the VM_RC_LIST.

Do you mean google_accounts_manager or google_accounts_daemon ? google_accounts_manager is not specified in VM_RC_LIST, it was replaced by google_accounts_daemon.

> Also, if you could please look at bug #222089 I outline a handful of other things that make for a slightly broken and sub-optimal VM image for GCE.

Sure, I'll take a look
Comment 15 Helen Koike 2017-09-25 14:03:20 UTC
Created attachment 186704 [details]
Patch removing google_accounts_manager from VM_RC_LIST

(In reply to Vick Khera from comment #13)
Ow, I see what you mean, in gce.conf there is still google_accounts_manager is not specified in VM_RC_LIST.
Please see attached patch removing it

Thanks
Comment 16 commit-hook freebsd_committer freebsd_triage 2018-03-22 17:46:46 UTC
A commit references this bug:

Author: gjb
Date: Thu Mar 22 17:46:38 UTC 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

Changes:
_U  stable/10/
  stable/10/release/tools/gce.conf
_U  stable/11/
  stable/11/release/tools/gce.conf
Comment 17 Glen Barber freebsd_committer freebsd_triage 2018-03-22 17:49:21 UTC
The original issue in the PR had been addressed, however I just noticed the mention of google_accounts_manager in VM_RC_LIST.  I have just committed that change, and will MFC in 3 days.

Sorry for the delay.
Comment 18 commit-hook freebsd_committer freebsd_triage 2018-03-22 17:49:51 UTC
A commit references this bug:

Author: gjb
Date: Thu Mar 22 17:49:28 UTC 2018
New revision: 331364
URL: https://svnweb.freebsd.org/changeset/base/331364

Log:
  Remove google_accounts_manager from VM_RC_LIST in the GCE configuration
  file, no longer needed.

  PR:		221714
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Changes:
  head/release/tools/gce.conf
Comment 19 commit-hook freebsd_committer freebsd_triage 2018-03-26 14:14:13 UTC
A commit references this bug:

Author: gjb
Date: Mon Mar 26 14:13:42 UTC 2018
New revision: 331549
URL: https://svnweb.freebsd.org/changeset/base/331549

Log:
  MFC r331364:
   Remove google_accounts_manager from VM_RC_LIST in the GCE configuration
   file, no longer needed.

  PR:		221714
  Sponsored by:	The FreeBSD Foundation

Changes:
_U  stable/10/
  stable/10/release/tools/gce.conf
_U  stable/11/
  stable/11/release/tools/gce.conf