Maxime Guyot
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
14 additions and
14 deletions
-
roles/container-engine/containerd/tasks/crictl.yml
-
roles/container-engine/cri-o/tasks/crictl.yml
-
roles/network_plugin/contiv/tasks/pre-reset.yml
-
tests/cloud_playbooks/create-aws.yml
-
tests/cloud_playbooks/create-do.yml
-
tests/cloud_playbooks/create-gce.yml
|
|
@ -4,9 +4,9 @@ |
|
|
|
vars: |
|
|
|
download: "{{ download_defaults | combine(downloads.crictl) }}" |
|
|
|
|
|
|
|
- name: Install crictl config # noqa 404 |
|
|
|
- name: Install crictl config |
|
|
|
template: |
|
|
|
src: ../templates/crictl.yaml.j2 |
|
|
|
src: ../templates/crictl.yaml.j2 # noqa 404 not in role_path when task is included from download role |
|
|
|
dest: /etc/crictl.yaml |
|
|
|
owner: bin |
|
|
|
mode: 0644 |
|
|
|
|
|
@ -4,9 +4,9 @@ |
|
|
|
vars: |
|
|
|
download: "{{ download_defaults | combine(downloads.crictl) }}" |
|
|
|
|
|
|
|
- name: Install crictl config # noqa 404 |
|
|
|
- name: Install crictl config |
|
|
|
template: |
|
|
|
src: ../templates/crictl.yaml.j2 |
|
|
|
src: ../templates/crictl.yaml.j2 # noqa 404 not in role_path when task is included from download role |
|
|
|
dest: /etc/crictl.yaml |
|
|
|
owner: bin |
|
|
|
mode: 0644 |
|
|
|
|
|
@ -21,9 +21,9 @@ |
|
|
|
- contiv_kubectl.stat.exists |
|
|
|
- inventory_hostname == groups['kube-master'][0] |
|
|
|
|
|
|
|
- name: reset | Copy contiv temporary cleanup script # noqa 404 |
|
|
|
- name: reset | Copy contiv temporary cleanup script |
|
|
|
copy: |
|
|
|
src: ../files/contiv-cleanup.sh # Not in role_path so we must trick... |
|
|
|
src: ../files/contiv-cleanup.sh # noqa 404 Not in role_path so we must trick... |
|
|
|
dest: /opt/cni/bin/cleanup |
|
|
|
owner: root |
|
|
|
group: root |
|
|
@ -31,9 +31,9 @@ |
|
|
|
when: |
|
|
|
- contiv_kubectl.stat.exists |
|
|
|
|
|
|
|
- name: reset | Lay down contiv cleanup template # noqa 404 |
|
|
|
- name: reset | Lay down contiv cleanup template |
|
|
|
template: |
|
|
|
src: ../templates/contiv-cleanup.yml.j2 # Not in role_path so we must trick... |
|
|
|
src: ../templates/contiv-cleanup.yml.j2 # noqa 404 Not in role_path so we must trick... |
|
|
|
dest: "{{ kube_config_dir }}/contiv-cleanup.yml" # kube_config_dir is used here as contiv_config_dir is not necessarily set at reset |
|
|
|
register: contiv_cleanup_manifest |
|
|
|
when: |
|
|
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
instance_tags: "{{ aws.tags }}" |
|
|
|
register: ec2 |
|
|
|
|
|
|
|
- name: Template the inventory # noqa 404 |
|
|
|
- name: Template the inventory |
|
|
|
template: |
|
|
|
src: ../templates/inventory-aws.j2 |
|
|
|
src: ../templates/inventory-aws.j2 # noqa 404 CI inventory templates are not in role_path |
|
|
|
dest: "{{ inventory_path }}" |
|
|
@ -86,8 +86,8 @@ |
|
|
|
msg: "{{ droplets }}, {{ inventory_path }}" |
|
|
|
when: state == 'present' |
|
|
|
|
|
|
|
- name: Template the inventory # noqa 404 |
|
|
|
- name: Template the inventory |
|
|
|
template: |
|
|
|
src: ../templates/inventory-do.j2 |
|
|
|
src: ../templates/inventory-do.j2 # noqa 404 CI templates are not in role_path |
|
|
|
dest: "{{ inventory_path }}" |
|
|
|
when: state == 'present' |
|
|
@ -49,7 +49,7 @@ |
|
|
|
add_host: hostname={{ item.public_ip }} groupname="waitfor_hosts" |
|
|
|
with_items: '{{ gce.instance_data }}' |
|
|
|
|
|
|
|
- name: Template the inventory # noqa 404 |
|
|
|
- name: Template the inventory # noqa 404 CI inventory templates are not in role_path |
|
|
|
template: |
|
|
|
src: ../templates/inventory-gce.j2 |
|
|
|
dest: "{{ inventory_path }}" |
|
|
@ -60,7 +60,7 @@ |
|
|
|
state: directory |
|
|
|
when: mode in ['scale', 'separate-scale', 'ha-scale'] |
|
|
|
|
|
|
|
- name: Template fake hosts group vars # noqa 404 |
|
|
|
- name: Template fake hosts group vars # noqa 404 CI templates are not in role_path |
|
|
|
template: |
|
|
|
src: ../templates/fake_hosts.yml.j2 |
|
|
|
dest: "{{ inventory_path|dirname }}/group_vars/fake_hosts.yml" |
|
|
|