Skip to content
Snippets Groups Projects
Unverified Commit 058438a2 authored by Barry Melbourne's avatar Barry Melbourne Committed by GitHub
Browse files

Remove support for CoreOS Container Linux (#6576)

parent 6e938a31
No related branches found
No related tags found
No related merge requests found
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
- hosts: kube-master[0] - hosts: kube-master[0]
tasks: tasks:
- name: Force binaries directory for Container Linux by CoreOS and Flatcar - name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact: set_fact:
bin_dir: "/opt/bin" bin_dir: "/opt/bin"
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- name: Force binaries directory for other hosts - name: Force binaries directory for other hosts
set_fact: set_fact:
bin_dir: "/usr/local/bin" bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- import_role: - import_role:
name: cluster-dump name: cluster-dump
......
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
- hosts: kube-master[0] - hosts: kube-master[0]
tasks: tasks:
- name: Force binaries directory for Container Linux by CoreOS and Flatcar - name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact: set_fact:
bin_dir: "/opt/bin" bin_dir: "/opt/bin"
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- name: Force binaries directory for other hosts - name: Force binaries directory for other hosts
set_fact: set_fact:
bin_dir: "/usr/local/bin" bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- import_role: - import_role:
name: cluster-dump name: cluster-dump
......
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
test_image_tag: latest test_image_tag: latest
tasks: tasks:
- name: Force binaries directory for Container Linux by CoreOS and Flatcar - name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact: set_fact:
bin_dir: "/opt/bin" bin_dir: "/opt/bin"
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- name: Force binaries directory for other hosts - name: Force binaries directory for other hosts
set_fact: set_fact:
bin_dir: "/usr/local/bin" bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- name: Create test namespace # noqa 301 305 - name: Create test namespace # noqa 301 305
shell: "{{ bin_dir }}/kubectl create namespace test" shell: "{{ bin_dir }}/kubectl create namespace test"
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
- name: Force binaries directory for Container Linux by CoreOS and Flatcar - name: Force binaries directory for Container Linux by CoreOS and Flatcar
set_fact: set_fact:
bin_dir: "/opt/bin" bin_dir: "/opt/bin"
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- name: Force binaries directory on other hosts - name: Force binaries directory on other hosts
set_fact: set_fact:
bin_dir: "/usr/local/bin" bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] when: not ansible_os_family in ["Flatcar Container Linux by Kinvolk"]
- import_role: - import_role:
name: cluster-dump name: cluster-dump
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment