Merge changes from topics "bump-kubespray", "refactor-k8s-scenarios"

* changes:
  Bump kubespray version to bring k8s v1.15.3
  Bump ansible to 2.7.8
  Refactor k8s scenario implementation

7 files changed, 84 insertions, 31 deletions

diff --git a/xci/config/env-vars b/xci/config/env-vars
index 2cb3e915..a90e8533 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -8,7 +8,7 @@ export OPNFV_RELENG_GIT_URL=${OPNFV_RELENG_GIT_URL:-https://gerrit.opnfv.org/ger
 export OPENSTACK_BIFROST_GIT_URL=${OPENSTACK_BIFROST_GIT_URL:-https://git.openstack.org/openstack/bifrost}
 export OPENSTACK_OSA_GIT_URL=${OPENSTACK_OSA_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible}
 export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-openstack_openrc}
-export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git}
+export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-sigs/kubespray.git}
 export OSH_GIT_URL=${OSH_GIT_URL:-https://github.com/openstack/openstack-helm.git}
 export OSH_INFRA_GIT_URL=${OSH_INFRA_GIT_URL:-https://github.com/openstack/openstack-helm-infra.git}
 export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server}
@@ -57,7 +57,7 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}
 # https://github.com/ansible/ansible/commit/67859c3476501d5d9839fd904aec55468d09593a
 # This was fixed in 2.5.6 so remove the pin when OSA updates to newer version.
 #export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")}
-export XCI_ANSIBLE_PIP_VERSION="2.5.8"
+export XCI_ANSIBLE_PIP_VERSION="2.7.8"
 
 export ANSIBLE_HOST_KEY_CHECKING=False
 export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"}
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index e40cf442..440972ae 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -48,5 +48,8 @@ export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
 export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \
        ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
        | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')
-# Kubespray release v2.7.0 dated 02.10.2018
-export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"v2.7.0"}
+# Kubespray release v2.11.0 dated 31.08.2019
+export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"v2.11.0"}
+# Kubernetes version supported by the pinned kubespray version
+# this is needed for pulling in kubectl
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.15.3"}
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh
index 76d503c5..af80b38f 100755
--- a/xci/installer/kubespray/deploy.sh
+++ b/xci/installer/kubespray/deploy.sh
@@ -33,6 +33,20 @@ echo "-----------------------------------------------------------------------"
 echo "Info: Configured localhost for kubespray"
 
 #-------------------------------------------------------------------------------
+# Configure installer
+#-------------------------------------------------------------------------------
+# TODO: summarize what this playbook does
+#-------------------------------------------------------------------------------
+
+echo "Info: Configuring kubespray installer"
+echo "-----------------------------------------------------------------------"
+cd $K8_XCI_PLAYBOOKS
+ansible-playbook ${XCI_ANSIBLE_PARAMS} \
+        -i ${XCI_PLAYBOOKS}/dynamic_inventory.py configure-installer.yml
+echo "-----------------------------------------------------------------------"
+echo "Info: Configured kubespray installer"
+
+#-------------------------------------------------------------------------------
 # Configure deployment host, opnfv
 #-------------------------------------------------------------------------------
 # This playbook
@@ -75,7 +89,7 @@ echo "-----------------------------------------------------------------------"
 ssh root@$OPNFV_HOST_IP "set -o pipefail; export XCI_FLAVOR=$XCI_FLAVOR; export INSTALLER_TYPE=$INSTALLER_TYPE; \
         export IDF=/root/releng-xci/xci/var/idf.yml; export PDF=/root/releng-xci/xci/var/pdf.yml; \
         cd releng-xci/.cache/repos/kubespray/; ansible-playbook \
-        -i opnfv_inventory/dynamic_inventory.py cluster.yml -b | tee setup-kubernetes.log"
+        -i inventory/opnfv/dynamic_inventory.py cluster.yml -b | tee setup-kubernetes.log"
 scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \
         $LOG_PATH/setup-kubernetes.log
 
@@ -88,19 +102,15 @@ echo "-----------------------------------------------------------------------"
 echo "Info: Kubernetes installation is successfully completed!"
 echo "-----------------------------------------------------------------------"
 
-# Configure the kubernetes authentication in opnfv host. In future releases
-# kubectl is no longer an artifact so we should not fail if it's not available.
-# This needs to be removed in the future
-ssh root@$OPNFV_HOST_IP "mkdir -p ~/.kube/;\
-         cp -f ~/admin.conf ~/.kube/config; \
-         cp -f ~/kubectl /usr/local/bin || true"
-
 #-------------------------------------------------------------------------------
 # Execute post-installation tasks
 #-------------------------------------------------------------------------------
 # Playbook post.yml is used in order to execute any post-deployment tasks that
 # are required for the scenario under test.
 #-------------------------------------------------------------------------------
+# copy admin.conf
+ssh root@$OPNFV_HOST_IP "mkdir -p ~/.kube/; \
+    cp -f ~/admin.conf ~/.kube/config"
 echo "-----------------------------------------------------------------------"
 echo "Info: Running post-deployment scenario role"
 echo "-----------------------------------------------------------------------"
diff --git a/xci/installer/kubespray/playbooks/configure-installer.yml b/xci/installer/kubespray/playbooks/configure-installer.yml
new file mode 100644
index 00000000..1f3b3d6f
--- /dev/null
+++ b/xci/installer/kubespray/playbooks/configure-installer.yml
@@ -0,0 +1,46 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+- hosts: localhost
+  connection: local
+  vars_files:
+    - "{{ xci_path }}/xci/var/opnfv.yml"
+
+  tasks:
+    - name: delete existing kubespray/inventory/opnfv directory
+      file:
+        path: "{{ xci_path }}/.cache/repos/kubespray/inventory/opnfv"
+        state: absent
+
+    - name: copy kubespray/inventory/sample as kubespray/inventory/opnfv
+      copy:
+        src: "{{ xci_path }}/.cache/repos/kubespray/inventory/sample/"
+        dest: "{{ xci_path }}/.cache/repos/kubespray/inventory/opnfv"
+
+    - name: update kubespray k8s-cluster.yml for xci
+      lineinfile:
+        path: "{{ xci_path }}/.cache/repos/kubespray/inventory/opnfv/group_vars/k8s-cluster/k8s-cluster.yml"
+        regexp: "{{ item.regexp }}"
+        line: "{{ item.line }}"
+      with_items:
+        - { regexp: "kube_version:.*", line: "kube_version: {{ kubernetes_version }}" }
+        - { regexp: "kubeconfig_localhost:.*", line: "kubeconfig_localhost: true" }
+        - { regexp: "kube_basic_auth:.*", line: "kube_basic_auth: true" }
+        - { regexp: "dashboard_enabled:.*", line: "dashboard_enabled: true" }
+
+    - name: update kubespray artifacts_dir
+      lineinfile:
+        path: "{{ xci_path }}/.cache/repos/kubespray/inventory/opnfv/group_vars/k8s-cluster/k8s-cluster.yml"
+        regexp: "artifacts_dir:.*"
+        line: "artifacts_dir: '{{ '{{' }} ansible_env.HOME {{ '}}' }}'"
+
+    - name: change dashboard server type to NodePort
+      lineinfile:
+        path: "{{ xci_path }}/.cache/repos/kubespray/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2"
+        insertafter: 'targetPort'
+        line: "  type: NodePort"
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 54e32149..52e42b06 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -52,22 +52,20 @@
           - "--recursive"
           - "--files-from={{ xci_cache }}/releng-xci.files"
 
-    - name: delete the opnfv_inventory directory
-      file:
-        path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory"
-        state: absent
-
-    - name: make sure kubespray/opnfv_inventory/group_vars/ exist
-      file:
-        path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
-        state: directory
-
-    - name: copy kubespray inventory directory
+    - name: link xci dynamic inventory to kubespray/inventory/opnfv directory
       file:
         src: "{{ remote_xci_playbooks }}/dynamic_inventory.py"
-        path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/dynamic_inventory.py"
+        path: "{{ remote_xci_path }}/.cache/repos/kubespray/inventory/opnfv/dynamic_inventory.py"
         state: link
 
+    - name: Download kubectl and place it to /usr/local/bin
+      get_url:
+        url: "https://storage.googleapis.com/kubernetes-release/release/{{ kubernetes_version }}/bin/linux/amd64/kubectl"
+        dest: /usr/local/bin/kubectl
+        owner: root
+        group: root
+        mode: 0755
+
     - name: Reload XCI deployment host facts
       setup:
         filter: ansible_local
@@ -85,12 +83,6 @@
         update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
       when: xci_flavor == 'aio'
 
-    - name: change dashboard server type to NodePort
-      lineinfile:
-        path: "{{ remote_xci_path }}/.cache/repos/kubespray/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2"
-        insertafter: 'targetPort'
-        line: "  type: NodePort"
-
     - name: pip install required packages
       pip:
         name: "{{ item.name }}"
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index 98abf528..8a4f9842 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -145,7 +145,8 @@
 - scenario: k8-calico-nofeature
   scm: git
   src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios
-  version: master
+  version: 94625920bd45180934815d8ce33197805dfff921
+  refspec: refs/changes/18/68418/6
   role: scenarios/k8-calico-nofeature/role/k8-calico-nofeature
   installers:
     - installer: kubespray
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 8e4f9b8d..91b9ee38 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -28,6 +28,7 @@ openstack_osa_haproxy_git_url: "{{ lookup('env','OPENSTACK_OSA_HAPROXY_GIT_URL')
 # kubespray variables
 kubespray_git_url: "{{ lookup('env','KUBESPRAY_GIT_URL') }}"
 kubespray_version: "{{ lookup('env','KUBESPRAY_VERSION') }}"
+kubernetes_version: "{{ lookup('env','KUBERNETES_VERSION') }}"
 xci_kube_ansible_pip_version: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}"
 
 # openstack-helm variables