diff options
author | Fatih Degirmenci <fdegir@gmail.com> | 2019-09-02 10:40:33 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-09-02 10:40:33 +0000 |
commit | b1dffe564b9fd5547b65c93431c4389def16b7c2 (patch) | |
tree | ab171c23410409205ffa3ed17639aafcafbf5252 /xci/installer/kubespray/playbooks/configure-opnfvhost.yml | |
parent | d400b162a7c43472b1ea54f096b7fce4dc699253 (diff) | |
parent | f098d178cbbaa1096786c0d181d6693461fe4eb5 (diff) |
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
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 }}" |