diff options
author | Fatih Degirmenci <fdegir@gmail.com> | 2019-08-31 18:50:05 +0200 |
---|---|---|
committer | Fatih Degirmenci <fdegir@gmail.com> | 2019-09-01 02:45:10 +0200 |
commit | 5ed2d835de246e3cfb0878d78b382115ec8f0987 (patch) | |
tree | f0c515ce1da4444eae0334cf73fcd99d8f9708d8 /xci/installer/kubespray/playbooks/configure-opnfvhost.yml | |
parent | 0326442e753be727c2342b7caf9606393f84d744 (diff) |
Refactor k8s scenario implementation
This change updates the scenario logic for basic k8s
scenarios that enables the use of various network plugins.
The change simply stops copying k8s-cluster.yml over but instead
operates on the existing/original k8s-cluster.yml and updates
kube_network_plugin in place.
This makes it easier to maintain the scenarios and more importantly
unblocks us from bumping kubespray and kubernetes versions.
Please note that opnfv-scenario-requirements.yml contains version and
the refspec of the corresponding change in releng-xci-scenarios repo
so this change must be verified properly and if it passes CI, it
needs to be amended, updating k8-calico-nofeature scenario's version
to master and submitted. And then the change in releng-xci-scenarios
can properly be verified.
https://gerrit.opnfv.org/gerrit/#/c/releng-xci-scenarios/+/68418/
installer-type:kubespray
deploy-scenario:k8-calico-nofeature
JIRA: XCI-20
Change-Id: I1f851d20f5f7bc256199303581b05659091fddf9
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/installer/kubespray/playbooks/configure-opnfvhost.yml')
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 28 |
1 files changed, 10 insertions, 18 deletions
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 }}" |