some minor fix during test on ubuntu (#451)

* some minor fix during test on ubuntu

* Additional change based on test

* cluster.yaml

* djust folder

Author: jichenjc

samples/generate-yaml.sh

@@ -118,8 +118,8 @@ TEMPLATES_PATH=${TEMPLATES_PATH:-$PWD/$SUPPORTED_PROVIDER_OS}
 HOME_DIR=${PWD%%/samples/*}
 CONFIG_DIR=$PWD/templates/clouds-secrets/configs
 USERDATA=$PWD/templates/user-data
-MASTER_USER_DATA=$USERDATA/$PROVIDER_OS/templates/master-user-data.sh
-WORKER_USER_DATA=$USERDATA/$PROVIDER_OS/templates/worker-user-data.sh
+MASTER_USER_DATA=$USERDATA/$PROVIDER_OS/templates/master-user-data.sh.template
+WORKER_USER_DATA=$USERDATA/$PROVIDER_OS/templates/worker-user-data.sh.template
 
 # Container Linux (simply named CoreOS here) does its configuration a bit different
 # so it gets some of its own vars here.

samples/templates/cluster.yaml

@@ -1,7 +1,7 @@
 apiVersion: cluster.x-k8s.io/v1alpha2
 kind: Cluster
 metadata:
-  name: cluster001
+  name: test-cluster
   namespace: default
 spec:
   clusterNetwork:
@@ -13,17 +13,21 @@ spec:
   infrastructureRef:
     kind: OpenStackCluster
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
-    name: cluster001
+    name: test-cluster
     namespace: default
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: OpenStackCluster
 metadata:
-  name: cluster001
+  name: test-cluster
   namespace: default
 spec:
   tags:
     - a_cluster_wide_tag
+  cloudName: <Cloud Name>
+  cloudsSecret:
+    name: cloud-config
+    namespace: capo-system
   clusterConfiguration:
     controlPlaneEndpoint: <apiServerLoadBalancer or master IP>:6443
     kubernetesVersion: 1.15.0

samples/templates/machines.yaml

@@ -17,13 +17,14 @@ spec:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
     namespace: default
     name: test-cluster-kube-master-01
-  version: "v1.15.0"
+  version: "1.15.0"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: OpenStackMachine
 metadata:
   name: test-cluster-kube-master-01
 spec:
+  cloudName: <Cloud Name>
   flavor: m1.medium
   image: <Image Name>
   keyName: cluster-api-provider-openstack
@@ -49,11 +50,11 @@ metadata:
 spec:
   clusterConfiguration:
     certificatesDir: /etc/kubernetes/pki
-    controlPlaneEndpoint: "53.48.112.86:6443"
+    controlPlaneEndpoint: <End point Ip: End point Address>
     dns:
       type: "CoreDNS"
     imageRepository: "k8s.gcr.io"
-    kubernetesVersion: v1.14.2
+    kubernetesVersion: 1.15.0
     networking:
       dnsDomain: ""
       podSubnet: ""
@@ -78,13 +79,14 @@ spec:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
     namespace: default
     name: test-cluster-openstack-node-01
-  version: "v1.15.0"
+  version: "1.15.0"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: OpenStackMachine
 metadata:
   name: test-cluster-openstack-node-01
 spec:
+  cloudName: <Cloud Name>
   flavor: m1.medium
   image: <Image Name>
   keyName: cluster-api-provider-openstack

samples/templates/user-data/centos/templates/master-user-data.sh

@@ -66,7 +66,7 @@ echo $OPENSTACK_CLOUD_CACERT_CONFIG | base64 -d > /etc/certs/cacert
 
 
 # Setup certificates
-mkdir - /etc/kubernetes/pki /etc/kubernetes/pki/etcd
+mkdir /etc/kubernetes/pki /etc/kubernetes/pki/etcd
 cat > /etc/kubernetes/pki/ca.crt <<EOF
 {{ .CACert }}
 EOF

samples/templates/user-data/ubuntu/master-user-data.sh

@@ -90,7 +90,7 @@ systemctl disable ufw
 systemctl mask ufw
 
 # Setup certificates
-mkdir - /etc/kubernetes/pki /etc/kubernetes/pki/etcd
+mkdir /etc/kubernetes/pki /etc/kubernetes/pki/etcd
 cat > /etc/kubernetes/pki/ca.crt <<EOF
 {{ .CACert }}
 EOF