Apply changes of installer.sh

Apply changes to installer.sh
to fix kubespray issue

Change-Id: Ib63e34f6f47b090802149e8ec3ba6e22dd390747
Signed-off-by: Ruoyu <ruoyu.ying@intel.com>

diff --git a/platform/test/e2e-test-crd/edge-a/installer.sh b/platform/test/e2e-test-crd/edge-a/installer.sh
index fd6349f..cd24420 100755 (executable)
--- a/platform/test/e2e-test-crd/edge-a/installer.sh
+++ b/platform/test/e2e-test-crd/edge-a/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test-crd/edge-a/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test-crd/edge-a/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test-crd/edge-a/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test-crd/edge-a/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true

diff --git a/platform/test/e2e-test-crd/edge-b/installer.sh b/platform/test/e2e-test-crd/edge-b/installer.sh
index 3ef2762..d80e40a 100755 (executable)
--- a/platform/test/e2e-test-crd/edge-b/installer.sh
+++ b/platform/test/e2e-test-crd/edge-b/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test-crd/edge-b/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test-crd/edge-b/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test-crd/edge-b/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test-crd/edge-b/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true

diff --git a/platform/test/e2e-test-crd/edge-scripts/helm-tmp/cnf/templates/deployment.yaml b/platform/test/e2e-test-crd/edge-scripts/helm-tmp/cnf/templates/deployment.yaml
index 4e0239c..9383f7d 100644 (file)
--- a/platform/test/e2e-test-crd/edge-scripts/helm-tmp/cnf/templates/deployment.yaml
+++ b/platform/test/e2e-test-crd/edge-scripts/helm-tmp/cnf/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
           name: podinfo
           readOnly: true
       nodeSelector:
-        node-role.kubernetes.io/master: {{ .Values.nodeSelector }}
+        node-role.kubernetes.io/master: "{{ .Values.nodeSelector }}"
       restartPolicy: {{ .Values.restartPolicy }}
       volumes:
       - configMap:

diff --git a/platform/test/e2e-test-crd/sdewan-hub/installer.sh b/platform/test/e2e-test-crd/sdewan-hub/installer.sh
index 5f509a7..7db62f3 100755 (executable)
--- a/platform/test/e2e-test-crd/sdewan-hub/installer.sh
+++ b/platform/test/e2e-test-crd/sdewan-hub/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test-crd/sdewan-hub/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test-crd/sdewan-hub/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test-crd/sdewan-hub/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test-crd/sdewan-hub/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true

diff --git a/platform/test/e2e-test-crd/sdewan-hub/scripts/cnf/templates/deployment.yaml b/platform/test/e2e-test-crd/sdewan-hub/scripts/cnf/templates/deployment.yaml
index 4e0239c..9383f7d 100644 (file)
--- a/platform/test/e2e-test-crd/sdewan-hub/scripts/cnf/templates/deployment.yaml
+++ b/platform/test/e2e-test-crd/sdewan-hub/scripts/cnf/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
           name: podinfo
           readOnly: true
       nodeSelector:
-        node-role.kubernetes.io/master: {{ .Values.nodeSelector }}
+        node-role.kubernetes.io/master: "{{ .Values.nodeSelector }}"
       restartPolicy: {{ .Values.restartPolicy }}
       volumes:
       - configMap:

diff --git a/platform/test/e2e-test/edge-a/installer.sh b/platform/test/e2e-test/edge-a/installer.sh
index fd6349f..cd24420 100755 (executable)
--- a/platform/test/e2e-test/edge-a/installer.sh
+++ b/platform/test/e2e-test/edge-a/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test/edge-a/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test/edge-a/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test/edge-a/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test/edge-a/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true

diff --git a/platform/test/e2e-test/edge-b/installer.sh b/platform/test/e2e-test/edge-b/installer.sh
index 3ef2762..d80e40a 100755 (executable)
--- a/platform/test/e2e-test/edge-b/installer.sh
+++ b/platform/test/e2e-test/edge-b/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test/edge-b/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test/edge-b/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test/edge-b/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test/edge-b/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true

diff --git a/platform/test/e2e-test/sdewan-hub/installer.sh b/platform/test/e2e-test/sdewan-hub/installer.sh
index 5f509a7..7db62f3 100755 (executable)
--- a/platform/test/e2e-test/sdewan-hub/installer.sh
+++ b/platform/test/e2e-test/sdewan-hub/installer.sh
@@ -102,6 +102,7 @@ function _set_environment_file {
     echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment
     echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment
     echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
+    echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment
 }
 
 # install_k8s() - Install Kubernetes using kubespray tool
@@ -117,7 +118,6 @@ function install_k8s {
     _install_ansible
     wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
     sudo tar -C $dest_folder -xzf $tarball
-    sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg
     sudo chown -R $USER $dest_folder/kubespray-$version
     sudo mkdir -p ${local_release_dir}/containers
     rm $tarball
@@ -139,6 +139,8 @@ function install_k8s {
     if [[ -n "${https_proxy:-}" ]]; then
         echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
+    export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
     ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment

diff --git a/platform/test/e2e-test/sdewan-hub/inventory/group_vars/k8s-cluster.yml b/platform/test/e2e-test/sdewan-hub/inventory/group_vars/k8s-cluster.yml
index 6f1c40b..ec27a22 100644 (file)
--- a/platform/test/e2e-test/sdewan-hub/inventory/group_vars/k8s-cluster.yml
+++ b/platform/test/e2e-test/sdewan-hub/inventory/group_vars/k8s-cluster.yml
@@ -49,7 +49,7 @@ local_volumes_enabled: true
 local_volume_provisioner_enabled: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.16.9
+kube_version: v1.17.0
 
 # Helm deployment
 helm_enabled: true