Commit 0ab6d096 authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'fix' into 'master'

fix

See merge request ansible/playbooks/kubernetes-kubespray-setup!34
parents b7bfc026 207fe4cb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@

!ansible.cfg
!README.md
!run.yml
!setup.yml
!requirements.yml

kubespray.yml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line
---

- name: Setup Kubespray
  hosts: kubernetes
  become: no
  gather_facts: no
  tasks:
    - name: Clone kubespray repo ({{ kubespray_repo | default('https://github.com/southbridgeio/kubespray.git') }}) with required version ({{ kubespray_commit }})
      git:
        repo: "{{ kubespray_repo | default('https://github.com/southbridgeio/kubespray.git') }}"
        version: "{{ kubespray_commit }}"
        dest: kubespray
        clone: yes
      delegate_to: 127.0.0.1
      run_once: True

run.sh

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line
#!/usr/bin/env sh

ansible-playbook -i "${INVENTORY_DIRECTORY}/inventory.ini" kubespray.yml

python3 -m venv --upgrade --system-site-packages .venv-kubespray
.venv-kubespray/bin/pip3 install --upgrade pip
.venv-kubespray/bin/pip3 install wheel
.venv-kubespray/bin/pip3 install -r kubespray/requirements.txt

ANSIBLE_CONFIG=kubespray/ansible.cfg \
.venv-kubespray/bin/ansible-playbook \
${PARAMETERS} -u ${USERNAME:-maintenance} \
-i "${INVENTORY_DIRECTORY}/inventory.ini" \
--become --become-user=root -T 90 \
"${PLAYBOOK:-deploy.yml}"

setup.yml

0 → 100644
+23 −0
Original line number Diff line number Diff line
---

- name: Setup Kubespray
  hosts: kubernetes
  become: no
  gather_facts: no
  tasks:
    - block:

      - name: Verify Ansible meets Kubespray version requirements
        assert:
          that: "ansible_version.full is version_compare('2.10', '<')"
          msg: >
            "You must use Ansible version before 2.10 to use this version of Kubespray!"
      - name: Clone kubespray repo ({{ kubespray_repo | default('https://github.com/southbridgeio/kubespray.git') }}) with required version ({{ kubespray_commit }})
        git:
          repo: "{{ kubespray_repo | default('https://github.com/southbridgeio/kubespray.git') }}"
          version: "{{ kubespray_commit }}"
          dest: kubespray
          clone: yes

      delegate_to: 127.0.0.1
      run_once: True