Makes cluster/gce/ubuntu to be a symlink to cluster/gce/gci and chang…

…es the gci's [master|node].yaml to enable kubernetes.target.

This enables Ubuntu to use the same provisioning scripts as GCI's. The
change for enabling kubernetes.target is needed for Ubuntu but a no-op
for GCI.

cluster/common.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015 The Kubernetes Authors.
+# Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cluster/gce/gci/master.yaml

@@ -112,6 +112,9 @@ write_files:
       [Unit]
       Description=Kubernetes
 
+      [Install]
+      WantedBy=multi-user.target
+
 runcmd:
  - systemctl daemon-reload
  - systemctl enable kube-master-installation.service
@@ -120,4 +123,5 @@ runcmd:
  - systemctl enable kubelet-monitor.service
  - systemctl enable kube-logrotate.timer
  - systemctl enable kube-logrotate.service
+ - systemctl enable kubernetes.target
  - systemctl start kubernetes.target

cluster/gce/gci/node.yaml

@@ -112,6 +112,9 @@ write_files:
       [Unit]
       Description=Kubernetes
 
+      [Install]
+      WantedBy=multi-user.target
+
 runcmd:
  - systemctl daemon-reload
  - systemctl enable kube-node-installation.service
@@ -120,4 +123,5 @@ runcmd:
  - systemctl enable kubelet-monitor.service
  - systemctl enable kube-logrotate.timer
  - systemctl enable kube-logrotate.service
+ - systemctl enable kubernetes.target
  - systemctl start kubernetes.target

cluster/gce/ubuntu

@@ -0,0 +1 @@
+gci