Fix cacert issue (#465)

* Fix cacert issue

* Fix indent issue

Author: jichenjc

examples/controlplane/controlplane.yaml

@@ -65,9 +65,8 @@ spec:
   - path: /etc/certs/cacert
     owner: root
     permissions: "0600"
-    content: |-
-      # cacert to communicate with OpenStack
-      $OPENSTACK_CLOUD_CACERT_CONFIG
+    content: |
+      $OPENSTACK_CLOUD_CACERT_CONFIG6
   ntp:
     servers: []
   users:
@@ -176,9 +175,8 @@ spec:
   - path: /etc/certs/cacert
     owner: root
     permissions: "0600"
-    content: |-
-      # cacert to communicate with OpenStack
-      $OPENSTACK_CLOUD_CACERT_CONFIG
+    content: |
+      $OPENSTACK_CLOUD_CACERT_CONFIG6
   ntp:
     servers: []
   users:
@@ -258,9 +256,8 @@ spec:
   - path: /etc/certs/cacert
     owner: root
     permissions: "0600"
-    content: |-
-      # cacert to communicate with OpenStack
-      $OPENSTACK_CLOUD_CACERT_CONFIG
+    content: |
+      $OPENSTACK_CLOUD_CACERT_CONFIG6
   ntp:
     servers: []
   users:

examples/generate.sh

@@ -173,22 +173,11 @@ OPENSTACK_CLOUD_PROVIDER_CONF6=$(echo "${OPENSTACK_CLOUD_PROVIDER_CONF}" | sed -
 export OPENSTACK_CLOUD_PROVIDER_CONF10
 OPENSTACK_CLOUD_PROVIDER_CONF10=$(echo "${OPENSTACK_CLOUD_PROVIDER_CONF}" | sed -e 's/^/          /')
 
-OS=$(uname)
-if [[ "$OS" =~ "Linux" ]]; then
-#  export OPENSTACK_CLOUD_PROVIDER_CONF=$(echo "$OPENSTACK_CLOUD_PROVIDER_CONF_PLAIN"|base64 -w0)
-  if [[ "$CACERT_ORIGINAL" != "null" ]]; then
-    export OPENSTACK_CLOUD_CACERT_CONFIG
-    OPENSTACK_CLOUD_CACERT_CONFIG=$(cat "$CACERT_ORIGINAL"|base64 -w0)
-  fi
-elif [[ "$OS" =~ "Darwin" ]]; then
-#  export OPENSTACK_CLOUD_PROVIDER_CONF=$(echo "$OPENSTACK_CLOUD_PROVIDER_CONF_PLAIN"|base64)
-  if [[ "$CACERT_ORIGINAL" != "null" ]]; then
-    export OPENSTACK_CLOUD_CACERT_CONFIG
-    OPENSTACK_CLOUD_CACERT_CONFIG=$(cat "$CACERT_ORIGINAL"|base64)
-  fi
-else
-  echo "Unrecognized OS : $OS"
-  exit 1
+if [[ "$CACERT_ORIGINAL" != "null" ]]; then
+  export OPENSTACK_CLOUD_CACERT_CONFIG6
+  OPENSTACK_CLOUD_CACERT_CONFIG6=$(cat "$CACERT_ORIGINAL" | sed -e 's/^/      /')
+  export OPENSTACK_CLOUD_CACERT_CONFIG10
+  OPENSTACK_CLOUD_CACERT_CONFIG10=$(cat "$CACERT_ORIGINAL" | sed -e 's/^/          /')
 fi
 
 echo "${OPENSTACK_CLOUD_CONFIG_SELECTED_CLOUD}" > ${CLOUDS_SECRETS_CONFIG_DIR}/clouds.yaml

examples/machinedeployment/machinedeployment.yaml

@@ -72,9 +72,8 @@ spec:
         owner: root
         path: /etc/kubernetes/cloud.conf
         permissions: "0600"
-      - content: |-
-          # cacert to communicate with OpenStack
-          $OPENSTACK_CLOUD_CACERT_CONFIG
+      - content: |
+          $OPENSTACK_CLOUD_CACERT_CONFIG10
         owner: root
         path: /etc/certs/cacert
         permissions: "0600"