diff options
author | Christian Pointner <equinox@spreadspace.org> | 2021-05-19 12:10:01 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2021-05-19 12:56:39 +0200 |
commit | d8dccd9ea23d45cfbe3c3ab55a0c7052a99cabe2 (patch) | |
tree | c2d91aa60af67ce1c1aa7c3b7a5b48c58c145b77 | |
parent | fix epimetheus dstat script (diff) |
rename apt-repo github-containers to kubic-project
-rw-r--r-- | chaos-at-home/ch-equinox-t450s.yml | 2 | ||||
-rw-r--r-- | chaos-at-home/ch-equinox-ws.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-equinox-t450s.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-equinox-ws.yml | 2 | ||||
-rw-r--r-- | roles/apt-repo/kubic-project/files/repo.gpg (renamed from roles/apt-repo/github-containers/files/repo.gpg) | bin | 723 -> 723 bytes | |||
-rw-r--r-- | roles/apt-repo/kubic-project/tasks/main.yml (renamed from roles/apt-repo/github-containers/tasks/main.yml) | 12 | ||||
-rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml index 389a39ed..80e99072 100644 --- a/chaos-at-home/ch-equinox-t450s.yml +++ b/chaos-at-home/ch-equinox-t450s.yml @@ -10,7 +10,7 @@ - role: apt-repo/backports - role: apt-repo/spreadspace - role: apt-repo/tor-project - - role: apt-repo/github-containers + - role: apt-repo/kubic-project - role: apt-repo/kubernetes - role: apt-repo/riot - role: apt-repo/nordvpn diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index 3cabbaeb..0db95730 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -11,7 +11,7 @@ - role: apt-repo/backports - role: apt-repo/spreadspace - role: apt-repo/tor-project - - role: apt-repo/github-containers + - role: apt-repo/kubic-project - role: apt-repo/kubernetes - role: apt-repo/riot - role: ws/base diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml index 14773889..6897cd1b 100644 --- a/inventory/host_vars/ch-equinox-t450s.yml +++ b/inventory/host_vars/ch-equinox-t450s.yml @@ -242,7 +242,7 @@ ws_base_extra_packages: # needs apt-repo/tor-project - tor - tor-geoipdb - # needs apt-repo/github-containers + # needs apt-repo/kubic-project - buildah - containernetworking-plugins - podman diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index 8f4b709e..b4debc54 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -241,7 +241,7 @@ ws_base_extra_packages: # needs apt-repo/tor-project - tor - tor-geoipdb - # needs apt-repo/github-containers + # needs apt-repo/kubic-project - buildah - containernetworking-plugins - podman diff --git a/roles/apt-repo/github-containers/files/repo.gpg b/roles/apt-repo/kubic-project/files/repo.gpg Binary files differindex 9b827ee8..9b827ee8 100644 --- a/roles/apt-repo/github-containers/files/repo.gpg +++ b/roles/apt-repo/kubic-project/files/repo.gpg diff --git a/roles/apt-repo/github-containers/tasks/main.yml b/roles/apt-repo/kubic-project/tasks/main.yml index fae56380..115d4060 100644 --- a/roles/apt-repo/github-containers/tasks/main.yml +++ b/roles/apt-repo/kubic-project/tasks/main.yml @@ -2,19 +2,19 @@ - name: add repository key copy: src: repo.gpg - dest: /etc/apt/trusted.gpg.d/github-containers.gpg - register: apt_repo_github_containers_key + dest: /etc/apt/trusted.gpg.d/kubic-project.gpg + register: apt_repo_kubic_project_key - name: add repository entry copy: content: | deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/{{ (ansible_distribution == 'Ubuntu') | ternary('xUbuntu', ansible_distribution) }}_{{ ansible_distribution_version }}/ / - dest: /etc/apt/sources.list.d/github-containers.list - register: apt_repo_github_containers_sources + dest: /etc/apt/sources.list.d/kubic-project.list + register: apt_repo_kubic_project_sources - name: update apt cache - when: apt_repo_github_containers_key is changed or - apt_repo_github_containers_sources is changed + when: apt_repo_kubic_project_key is changed or + apt_repo_kubic_project_sources is changed command: apt-get update args: warn: false diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index adbd24aa..e10e4a78 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -15,7 +15,7 @@ - name: add apt repository for cri-tools include_role: - name: apt-repo/github-containers + name: apt-repo/kubic-project - name: install kubelet and common packages apt: |