/juju

provider/gce: don't set sshKeys instance metadata #6294

Merged
merged 1 commit into from Sep 22, 2016

Conversation

Reviewers

@reedobrien reedobrien

@anastasiamac anastasiamac

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@axw @jujubot @reedobrien @anastasiamac
@axw
Member

axw commented Sep 21, 2016

The GCE provider is bailing from StartInstances if
authorized-keys is empty. It should not be doing
this.

Also, we're only looking at authorized-keys in the
GCE provider to set the sshKeys instance metadata.
This is what GCE uses to keep track of the SSH keys
that it manages on an instance. We should not be
setting this; using cloud-init is sufficient.

Fixes https://bugs.launchpad.net/bugs/1625881
@axw
provider/gce: don't set sshKeys instance metadata 
The GCE provider is bailing from StartInstances if
authorized-keys is empty. It should not be doing
this.

Also, we're only looking at authorized-keys in the
GCE provider to set the sshKeys instance metadata.
This is what GCE uses to keep track of the SSH keys
that *it* manages on an instance. We should not be
setting this; using cloud-init is sufficient.

Fixes https://bugs.launchpad.net/bugs/1625881
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
7a17200
@axw
Member

axw commented Sep 21, 2016

QA

  1. bootstrap google
  2. juju ssh -m controller 0 (works)
  3. juju add-machine
  4. juju ssh -m default 0 (works also)

@hatched hatched referenced this pull request in juju/juju-gui Sep 21, 2016

Closed

Unable to deploy to new models on GCE #2027

@reedobrien

reedobrien approved these changes Sep 21, 2016
View changes

LGTM, but IANAGR.

Fixing a but purely by removing code. Awesome.

QA Checks out.

@anastasiamac

anastasiamac approved these changes Sep 21, 2016
View changes

Love it! Thanks \o/
I think it'll also help with this experience https://bugs.launchpad.net/juju/+bug/1624548

@axw
Member

axw commented Sep 21, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Sep 21, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju
@jujubot
Contributor

jujubot commented Sep 21, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/9296
@axw
Member

axw commented Sep 21, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Sep 21, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 1a2e3ba into juju:master Sep 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment