Skip to content

Commit 0d97e0a

Browse files
committed
Remove unneeded pip and docker-compose deps from Kubernetes example.
1 parent 69eb81e commit 0d97e0a

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ vagrant_ansible_inventory_default
55
*.retry
66
test.sh
77

8+
*/roles/geerlingguy.*
89
*/provisioning/roles/geerlingguy.*

kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Note for Windows users: *This guide assumes you're on a Mac or Linux host. Windo
1616

1717
1. Download this project and put it wherever you want.
1818
2. Open Terminal, cd to this directory (containing the `Vagrantfile` and this REAMDE file).
19-
3. Run `ansible-galaxy install -r requirements.yml` to install required Ansible roles.
19+
3. Run `ansible-galaxy install -r requirements.yml -p ./roles` to install required Ansible roles.
2020
4. Type in `vagrant up`, and let Vagrant do its magic.
2121

2222
Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*

kubernetes/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- vars/main.yml
77

88
pre_tasks:
9-
- name: Copy kube-flannel-vagrant.yml file in place.
9+
- name: Copy Flannel manifest tailored for Vagrant.
1010
copy:
1111
src: files/manifests/kube-system/kube-flannel-vagrant.yml
1212
dest: "~/kube-flannel-vagrant.yml"
@@ -15,9 +15,6 @@
1515
- role: geerlingguy.swap
1616
tags: ['swap', 'kubernetes']
1717

18-
- role: geerlingguy.pip
19-
tags: ['pip', 'docker']
20-
2118
- role: geerlingguy.docker
2219
tags: ['docker']
2320

kubernetes/requirements.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
22
- src: geerlingguy.swap
3-
- src: geerlingguy.pip
43
- src: geerlingguy.docker
54
- src: geerlingguy.kubernetes

kubernetes/vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ swap_file_state: absent
33
swap_file_path: /dev/mapper/packer--debian--9--amd64--vg-swap_1
44

55
docker_package: docker-ce=18.06.1~ce~3-0~debian
6+
docker_install_compose: False
67

78
kubernetes_allow_pods_on_master: False
89
kubernetes_pod_network_cidr: '10.244.0.0/16'

0 commit comments

Comments
 (0)