Merge pull request #105 from scality/move-kubespray

Move the `kubespray` subtree under `vendor`
scality · Jul 4, 2018 · 38a344b · 38a344b
2 parents 53215f5 + a11bbaa
commit 38a344b
Show file tree

Hide file tree

Showing 681 changed files with 12 additions and 12 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,6 @@
 credentials/
-kubespray/artifacts/
-kubespray/credentials/
+vendor/kubespray/artifacts/
+vendor/kubespray/credentials/
 
 .kube/
 .shell-env/

diff --git a/group_vars/k8s-cluster/00-kubespray-k8s-cluster.yml b/group_vars/k8s-cluster/00-kubespray-k8s-cluster.yml
@@ -1 +1 @@
-../../kubespray/inventory/sample/group_vars/k8s-cluster.yml
+../../vendor/kubespray/inventory/sample/group_vars/k8s-cluster.yml
diff --git a/kubespray/group_vars b/kubespray/group_vars
diff --git a/metal-k8s.yml b/metal-k8s.yml
@@ -30,10 +30,10 @@
   tags:
     - kubespray
   roles:
-    - role: kubespray/roles/kubespray-defaults/
+    - role: vendor/kubespray/roles/kubespray-defaults/
     - role: kubespray_var_patcher
 
-- import_playbook: 'kubespray/cluster.yml'
+- import_playbook: 'vendor/kubespray/cluster.yml'
   tags: kubespray
 
 - hosts: kube-node

diff --git a/roles/kube_metrics_server/meta/main.yml b/roles/kube_metrics_server/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-  - role: ../kubespray/roles/kubespray-defaults
+  - role: ../vendor/kubespray/roles/kubespray-defaults
diff --git a/roles/kubespray_module/library/kube.py b/roles/kubespray_module/library/kube.py
@@ -1 +1 @@
-../../../kubespray/library/kube.py
+../../../vendor/kubespray/library/kube.py
diff --git a/roles/kubespray_module/meta/main.yml b/roles/kubespray_module/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-    - role: ../kubespray/roles/kubespray-defaults
+    - role: ../vendor/kubespray/roles/kubespray-defaults
diff --git a/scale-metal-k8s.yml b/scale-metal-k8s.yml
@@ -21,7 +21,7 @@
   roles:
     - role: setup_lvm
 
-- import_playbook: 'kubespray/scale.yml'
+- import_playbook: 'vendor/kubespray/scale.yml'
   tags: kubespray
 
 - hosts: kube-node

diff --git a/third-party.yaml b/third-party.yaml
@@ -5,7 +5,7 @@ modules:
     repository: https://github.com/pires/kubernetes-elasticsearch-cluster.git
     ref: master
   license: Apache-2.0
-- path: kubespray
+- path: vendor/kubespray
   source:
     type: git-subtree
     repository: https://github.com/kubernetes-incubator/kubespray.git

diff --git a/tox.ini b/tox.ini
@@ -20,7 +20,7 @@ deps =
     pip==10.0.1
     pip-tools==2.0.1
 commands =
-    pip-compile --index --emit-trusted-host --annotate --upgrade --generate-hashes -o "{toxinidir}/requirements.txt" "{toxinidir}/kubespray/requirements.txt"
+    pip-compile --index --emit-trusted-host --annotate --upgrade --generate-hashes -o "{toxinidir}/requirements.txt" "{toxinidir}/vendor/kubespray/requirements.txt"
     pip-compile --index --emit-trusted-host --annotate --upgrade --generate-hashes -o "{toxinidir}/docs/requirements.txt" "{toxinidir}/docs/requirements.in"
 setenv =
     CUSTOM_COMPILE_COMMAND = tox -e pip-compile

diff --git a/kubespray/.github/ISSUE_TEMPLATE.md → vendor/kubespray/.github/ISSUE_TEMPLATE.md b/kubespray/.github/ISSUE_TEMPLATE.md → vendor/kubespray/.github/ISSUE_TEMPLATE.md
diff --git a/kubespray/.gitignore → vendor/kubespray/.gitignore b/kubespray/.gitignore → vendor/kubespray/.gitignore
diff --git a/kubespray/.gitlab-ci.yml → vendor/kubespray/.gitlab-ci.yml b/kubespray/.gitlab-ci.yml → vendor/kubespray/.gitlab-ci.yml
diff --git a/kubespray/.gitmodules → vendor/kubespray/.gitmodules b/kubespray/.gitmodules → vendor/kubespray/.gitmodules
diff --git a/kubespray/.yamllint → vendor/kubespray/.yamllint b/kubespray/.yamllint → vendor/kubespray/.yamllint
diff --git a/kubespray/CONTRIBUTING.md → vendor/kubespray/CONTRIBUTING.md b/kubespray/CONTRIBUTING.md → vendor/kubespray/CONTRIBUTING.md
diff --git a/kubespray/Dockerfile → vendor/kubespray/Dockerfile b/kubespray/Dockerfile → vendor/kubespray/Dockerfile
diff --git a/kubespray/LICENSE → vendor/kubespray/LICENSE b/kubespray/LICENSE → vendor/kubespray/LICENSE
diff --git a/kubespray/OWNERS → vendor/kubespray/OWNERS b/kubespray/OWNERS → vendor/kubespray/OWNERS
diff --git a/kubespray/README.md → vendor/kubespray/README.md b/kubespray/README.md → vendor/kubespray/README.md
diff --git a/kubespray/RELEASE.md → vendor/kubespray/RELEASE.md b/kubespray/RELEASE.md → vendor/kubespray/RELEASE.md
diff --git a/kubespray/SECURITY_CONTACTS → vendor/kubespray/SECURITY_CONTACTS b/kubespray/SECURITY_CONTACTS → vendor/kubespray/SECURITY_CONTACTS
diff --git a/kubespray/Vagrantfile → vendor/kubespray/Vagrantfile b/kubespray/Vagrantfile → vendor/kubespray/Vagrantfile
diff --git a/kubespray/ansible.cfg → vendor/kubespray/ansible.cfg b/kubespray/ansible.cfg → vendor/kubespray/ansible.cfg
diff --git a/kubespray/cluster.yml → vendor/kubespray/cluster.yml b/kubespray/cluster.yml → vendor/kubespray/cluster.yml
diff --git a/kubespray/code-of-conduct.md → vendor/kubespray/code-of-conduct.md b/kubespray/code-of-conduct.md → vendor/kubespray/code-of-conduct.md
diff --git a/...rib/aws_iam/kubernetes-master-policy.json → ...rib/aws_iam/kubernetes-master-policy.json b/...rib/aws_iam/kubernetes-master-policy.json → ...rib/aws_iam/kubernetes-master-policy.json
diff --git a/...ntrib/aws_iam/kubernetes-master-role.json → ...ntrib/aws_iam/kubernetes-master-role.json b/...ntrib/aws_iam/kubernetes-master-role.json → ...ntrib/aws_iam/kubernetes-master-role.json
diff --git a/...rib/aws_iam/kubernetes-minion-policy.json → ...rib/aws_iam/kubernetes-minion-policy.json b/...rib/aws_iam/kubernetes-minion-policy.json → ...rib/aws_iam/kubernetes-minion-policy.json
diff --git a/...ntrib/aws_iam/kubernetes-minion-role.json → ...ntrib/aws_iam/kubernetes-minion-role.json b/...ntrib/aws_iam/kubernetes-minion-role.json → ...ntrib/aws_iam/kubernetes-minion-role.json
diff --git a/.../aws_inventory/kubespray-aws-inventory.py → .../aws_inventory/kubespray-aws-inventory.py b/.../aws_inventory/kubespray-aws-inventory.py → .../aws_inventory/kubespray-aws-inventory.py
diff --git a/kubespray/contrib/azurerm/.gitignore → vendor/kubespray/contrib/azurerm/.gitignore b/kubespray/contrib/azurerm/.gitignore → vendor/kubespray/contrib/azurerm/.gitignore
diff --git a/kubespray/contrib/azurerm/README.md → vendor/kubespray/contrib/azurerm/README.md b/kubespray/contrib/azurerm/README.md → vendor/kubespray/contrib/azurerm/README.md
diff --git a/kubespray/contrib/azurerm/apply-rg.sh → vendor/kubespray/contrib/azurerm/apply-rg.sh b/kubespray/contrib/azurerm/apply-rg.sh → vendor/kubespray/contrib/azurerm/apply-rg.sh
diff --git a/kubespray/contrib/azurerm/apply-rg_2.sh → ...r/kubespray/contrib/azurerm/apply-rg_2.sh b/kubespray/contrib/azurerm/apply-rg_2.sh → ...r/kubespray/contrib/azurerm/apply-rg_2.sh
diff --git a/kubespray/contrib/azurerm/clear-rg.sh → vendor/kubespray/contrib/azurerm/clear-rg.sh b/kubespray/contrib/azurerm/clear-rg.sh → vendor/kubespray/contrib/azurerm/clear-rg.sh
diff --git a/kubespray/contrib/azurerm/clear-rg_2.sh → ...r/kubespray/contrib/azurerm/clear-rg_2.sh b/kubespray/contrib/azurerm/clear-rg_2.sh → ...r/kubespray/contrib/azurerm/clear-rg_2.sh
diff --git a/...ray/contrib/azurerm/generate-inventory.sh → ...ray/contrib/azurerm/generate-inventory.sh b/...ray/contrib/azurerm/generate-inventory.sh → ...ray/contrib/azurerm/generate-inventory.sh
diff --git a/...ay/contrib/azurerm/generate-inventory.yml → ...ay/contrib/azurerm/generate-inventory.yml b/...ay/contrib/azurerm/generate-inventory.yml → ...ay/contrib/azurerm/generate-inventory.yml
diff --git a/.../contrib/azurerm/generate-inventory_2.yml → .../contrib/azurerm/generate-inventory_2.yml b/.../contrib/azurerm/generate-inventory_2.yml → .../contrib/azurerm/generate-inventory_2.yml
diff --git a/...ay/contrib/azurerm/generate-templates.yml → ...ay/contrib/azurerm/generate-templates.yml b/...ay/contrib/azurerm/generate-templates.yml → ...ay/contrib/azurerm/generate-templates.yml
diff --git a/kubespray/contrib/azurerm/group_vars/all → .../kubespray/contrib/azurerm/group_vars/all b/kubespray/contrib/azurerm/group_vars/all → .../kubespray/contrib/azurerm/group_vars/all
diff --git a/...m/roles/generate-inventory/tasks/main.yml → ...m/roles/generate-inventory/tasks/main.yml b/...m/roles/generate-inventory/tasks/main.yml → ...m/roles/generate-inventory/tasks/main.yml
diff --git a/...generate-inventory/templates/inventory.j2 → ...generate-inventory/templates/inventory.j2 b/...generate-inventory/templates/inventory.j2 → ...generate-inventory/templates/inventory.j2
diff --git a/...roles/generate-inventory_2/tasks/main.yml → ...roles/generate-inventory_2/tasks/main.yml b/...roles/generate-inventory_2/tasks/main.yml → ...roles/generate-inventory_2/tasks/main.yml
diff --git a/...nerate-inventory_2/templates/inventory.j2 → ...nerate-inventory_2/templates/inventory.j2 b/...nerate-inventory_2/templates/inventory.j2 → ...nerate-inventory_2/templates/inventory.j2
diff --git a/...oles/generate-templates/defaults/main.yml → ...oles/generate-templates/defaults/main.yml b/...oles/generate-templates/defaults/main.yml → ...oles/generate-templates/defaults/main.yml
diff --git a/...m/roles/generate-templates/tasks/main.yml → ...m/roles/generate-templates/tasks/main.yml b/...m/roles/generate-templates/tasks/main.yml → ...m/roles/generate-templates/tasks/main.yml
diff --git a/...emplates/templates/availability-sets.json → ...emplates/templates/availability-sets.json b/...emplates/templates/availability-sets.json → ...emplates/templates/availability-sets.json
diff --git a/...generate-templates/templates/bastion.json → ...generate-templates/templates/bastion.json b/...generate-templates/templates/bastion.json → ...generate-templates/templates/bastion.json
diff --git a/...enerate-templates/templates/clear-rg.json → ...enerate-templates/templates/clear-rg.json b/...enerate-templates/templates/clear-rg.json → ...enerate-templates/templates/clear-rg.json
diff --git a/...generate-templates/templates/masters.json → ...generate-templates/templates/masters.json b/...generate-templates/templates/masters.json → ...generate-templates/templates/masters.json
diff --git a/...generate-templates/templates/minions.json → ...generate-templates/templates/minions.json b/...generate-templates/templates/minions.json → ...generate-templates/templates/minions.json
diff --git a/...generate-templates/templates/network.json → ...generate-templates/templates/network.json b/...generate-templates/templates/network.json → ...generate-templates/templates/network.json
diff --git a/...generate-templates/templates/storage.json → ...generate-templates/templates/storage.json b/...generate-templates/templates/storage.json → ...generate-templates/templates/storage.json
diff --git a/...ay/contrib/inventory_builder/inventory.py → ...ay/contrib/inventory_builder/inventory.py b/...ay/contrib/inventory_builder/inventory.py → ...ay/contrib/inventory_builder/inventory.py
diff --git a/...ontrib/inventory_builder/requirements.txt → ...ontrib/inventory_builder/requirements.txt b/...ontrib/inventory_builder/requirements.txt → ...ontrib/inventory_builder/requirements.txt
diff --git a/...spray/contrib/inventory_builder/setup.cfg → ...spray/contrib/inventory_builder/setup.cfg b/...spray/contrib/inventory_builder/setup.cfg → ...spray/contrib/inventory_builder/setup.cfg
diff --git a/kubespray/contrib/inventory_builder/setup.py → ...espray/contrib/inventory_builder/setup.py b/kubespray/contrib/inventory_builder/setup.py → ...espray/contrib/inventory_builder/setup.py
diff --git a/...b/inventory_builder/test-requirements.txt → ...b/inventory_builder/test-requirements.txt b/...b/inventory_builder/test-requirements.txt → ...b/inventory_builder/test-requirements.txt
diff --git a/...inventory_builder/tests/test_inventory.py → ...inventory_builder/tests/test_inventory.py b/...inventory_builder/tests/test_inventory.py → ...inventory_builder/tests/test_inventory.py
diff --git a/kubespray/contrib/inventory_builder/tox.ini → ...bespray/contrib/inventory_builder/tox.ini b/kubespray/contrib/inventory_builder/tox.ini → ...bespray/contrib/inventory_builder/tox.ini
diff --git a/kubespray/contrib/kvm-setup/README.md → vendor/kubespray/contrib/kvm-setup/README.md b/kubespray/contrib/kvm-setup/README.md → vendor/kubespray/contrib/kvm-setup/README.md
diff --git a/kubespray/contrib/kvm-setup/group_vars/all → ...ubespray/contrib/kvm-setup/group_vars/all b/kubespray/contrib/kvm-setup/group_vars/all → ...ubespray/contrib/kvm-setup/group_vars/all
diff --git a/kubespray/contrib/kvm-setup/kvm-setup.yml → ...kubespray/contrib/kvm-setup/kvm-setup.yml b/kubespray/contrib/kvm-setup/kvm-setup.yml → ...kubespray/contrib/kvm-setup/kvm-setup.yml
diff --git a/.../kvm-setup/roles/kvm-setup/tasks/main.yml → .../kvm-setup/roles/kvm-setup/tasks/main.yml b/.../kvm-setup/roles/kvm-setup/tasks/main.yml → .../kvm-setup/roles/kvm-setup/tasks/main.yml
diff --git a/...vm-setup/roles/kvm-setup/tasks/sysctl.yml → ...vm-setup/roles/kvm-setup/tasks/sysctl.yml b/...vm-setup/roles/kvm-setup/tasks/sysctl.yml → ...vm-setup/roles/kvm-setup/tasks/sysctl.yml
diff --git a/.../kvm-setup/roles/kvm-setup/tasks/user.yml → .../kvm-setup/roles/kvm-setup/tasks/user.yml b/.../kvm-setup/roles/kvm-setup/tasks/user.yml → .../kvm-setup/roles/kvm-setup/tasks/user.yml
diff --git a/...ntrib/network-storage/glusterfs/README.md → ...ntrib/network-storage/glusterfs/README.md b/...ntrib/network-storage/glusterfs/README.md → ...ntrib/network-storage/glusterfs/README.md
diff --git a/...b/network-storage/glusterfs/glusterfs.yml → ...b/network-storage/glusterfs/glusterfs.yml b/...b/network-storage/glusterfs/glusterfs.yml → ...b/network-storage/glusterfs/glusterfs.yml
diff --git a/...trib/network-storage/glusterfs/group_vars → ...trib/network-storage/glusterfs/group_vars b/...trib/network-storage/glusterfs/group_vars → ...trib/network-storage/glusterfs/group_vars
diff --git a/...twork-storage/glusterfs/inventory.example → ...twork-storage/glusterfs/inventory.example b/...twork-storage/glusterfs/inventory.example → ...twork-storage/glusterfs/inventory.example
diff --git a/...work-storage/glusterfs/roles/bootstrap-os → ...work-storage/glusterfs/roles/bootstrap-os b/...work-storage/glusterfs/roles/bootstrap-os → ...work-storage/glusterfs/roles/bootstrap-os
diff --git a/...orage/glusterfs/roles/glusterfs/README.md → ...orage/glusterfs/roles/glusterfs/README.md b/...orage/glusterfs/roles/glusterfs/README.md → ...orage/glusterfs/roles/glusterfs/README.md
diff --git a/.../roles/glusterfs/client/defaults/main.yml → .../roles/glusterfs/client/defaults/main.yml b/.../roles/glusterfs/client/defaults/main.yml → .../roles/glusterfs/client/defaults/main.yml
diff --git a/...erfs/roles/glusterfs/client/meta/main.yml → ...erfs/roles/glusterfs/client/meta/main.yml b/...erfs/roles/glusterfs/client/meta/main.yml → ...erfs/roles/glusterfs/client/meta/main.yml
diff --git a/...rfs/roles/glusterfs/client/tasks/main.yml → ...rfs/roles/glusterfs/client/tasks/main.yml b/...rfs/roles/glusterfs/client/tasks/main.yml → ...rfs/roles/glusterfs/client/tasks/main.yml
diff --git a/...s/glusterfs/client/tasks/setup-Debian.yml → ...s/glusterfs/client/tasks/setup-Debian.yml b/...s/glusterfs/client/tasks/setup-Debian.yml → ...s/glusterfs/client/tasks/setup-Debian.yml
diff --git a/...s/glusterfs/client/tasks/setup-RedHat.yml → ...s/glusterfs/client/tasks/setup-RedHat.yml b/...s/glusterfs/client/tasks/setup-RedHat.yml → ...s/glusterfs/client/tasks/setup-RedHat.yml
diff --git a/.../roles/glusterfs/server/defaults/main.yml → .../roles/glusterfs/server/defaults/main.yml b/.../roles/glusterfs/server/defaults/main.yml → .../roles/glusterfs/server/defaults/main.yml
diff --git a/...erfs/roles/glusterfs/server/meta/main.yml → ...erfs/roles/glusterfs/server/meta/main.yml b/...erfs/roles/glusterfs/server/meta/main.yml → ...erfs/roles/glusterfs/server/meta/main.yml
diff --git a/...rfs/roles/glusterfs/server/tasks/main.yml → ...rfs/roles/glusterfs/server/tasks/main.yml b/...rfs/roles/glusterfs/server/tasks/main.yml → ...rfs/roles/glusterfs/server/tasks/main.yml
diff --git a/...s/glusterfs/server/tasks/setup-Debian.yml → ...s/glusterfs/server/tasks/setup-Debian.yml b/...s/glusterfs/server/tasks/setup-Debian.yml → ...s/glusterfs/server/tasks/setup-Debian.yml
diff --git a/...s/glusterfs/server/tasks/setup-RedHat.yml → ...s/glusterfs/server/tasks/setup-RedHat.yml b/...s/glusterfs/server/tasks/setup-RedHat.yml → ...s/glusterfs/server/tasks/setup-RedHat.yml
diff --git a/.../glusterfs/server/templates/test-file.txt → .../glusterfs/server/templates/test-file.txt b/.../glusterfs/server/templates/test-file.txt → .../glusterfs/server/templates/test-file.txt
diff --git a/...rfs/roles/glusterfs/server/tests/test.yml → ...rfs/roles/glusterfs/server/tests/test.yml b/...rfs/roles/glusterfs/server/tests/test.yml → ...rfs/roles/glusterfs/server/tests/test.yml
diff --git a/...fs/roles/glusterfs/server/vars/Debian.yml → ...fs/roles/glusterfs/server/vars/Debian.yml b/...fs/roles/glusterfs/server/vars/Debian.yml → ...fs/roles/glusterfs/server/vars/Debian.yml
diff --git a/...fs/roles/glusterfs/server/vars/RedHat.yml → ...fs/roles/glusterfs/server/vars/RedHat.yml b/...fs/roles/glusterfs/server/vars/RedHat.yml → ...fs/roles/glusterfs/server/vars/RedHat.yml
diff --git a/...les/kubernetes-pv/ansible/tasks/main.yaml → ...les/kubernetes-pv/ansible/tasks/main.yaml b/...les/kubernetes-pv/ansible/tasks/main.yaml → ...les/kubernetes-pv/ansible/tasks/main.yaml
diff --git a/...glusterfs-kubernetes-endpoint-svc.json.j2 → ...glusterfs-kubernetes-endpoint-svc.json.j2 b/...glusterfs-kubernetes-endpoint-svc.json.j2 → ...glusterfs-kubernetes-endpoint-svc.json.j2
diff --git a/...tes/glusterfs-kubernetes-endpoint.json.j2 → ...tes/glusterfs-kubernetes-endpoint.json.j2 b/...tes/glusterfs-kubernetes-endpoint.json.j2 → ...tes/glusterfs-kubernetes-endpoint.json.j2
diff --git a/.../templates/glusterfs-kubernetes-pv.yml.j2 → .../templates/glusterfs-kubernetes-pv.yml.j2 b/.../templates/glusterfs-kubernetes-pv.yml.j2 → .../templates/glusterfs-kubernetes-pv.yml.j2
diff --git a/...sterfs/roles/kubernetes-pv/meta/main.yaml → ...sterfs/roles/kubernetes-pv/meta/main.yaml b/...sterfs/roles/kubernetes-pv/meta/main.yaml → ...sterfs/roles/kubernetes-pv/meta/main.yaml
diff --git a/...pray/contrib/packaging/rpm/kubespray.spec → ...pray/contrib/packaging/rpm/kubespray.spec b/...pray/contrib/packaging/rpm/kubespray.spec → ...pray/contrib/packaging/rpm/kubespray.spec
diff --git a/kubespray/contrib/terraform/aws/.gitignore → ...ubespray/contrib/terraform/aws/.gitignore b/kubespray/contrib/terraform/aws/.gitignore → ...ubespray/contrib/terraform/aws/.gitignore
diff --git a/kubespray/contrib/terraform/aws/README.md → ...kubespray/contrib/terraform/aws/README.md b/kubespray/contrib/terraform/aws/README.md → ...kubespray/contrib/terraform/aws/README.md
diff --git a/...ib/terraform/aws/create-infrastructure.tf → ...ib/terraform/aws/create-infrastructure.tf b/...ib/terraform/aws/create-infrastructure.tf → ...ib/terraform/aws/create-infrastructure.tf
diff --git a/.../terraform/aws/credentials.tfvars.example → .../terraform/aws/credentials.tfvars.example b/.../terraform/aws/credentials.tfvars.example → .../terraform/aws/credentials.tfvars.example
diff --git a/...trib/terraform/aws/docs/aws_kubespray.png → ...trib/terraform/aws/docs/aws_kubespray.png b/...trib/terraform/aws/docs/aws_kubespray.png → ...trib/terraform/aws/docs/aws_kubespray.png
diff --git a/...contrib/terraform/aws/modules/elb/main.tf → ...contrib/terraform/aws/modules/elb/main.tf b/...contrib/terraform/aws/modules/elb/main.tf → ...contrib/terraform/aws/modules/elb/main.tf
diff --git a/...trib/terraform/aws/modules/elb/outputs.tf → ...trib/terraform/aws/modules/elb/outputs.tf b/...trib/terraform/aws/modules/elb/outputs.tf → ...trib/terraform/aws/modules/elb/outputs.tf
diff --git a/...ib/terraform/aws/modules/elb/variables.tf → ...ib/terraform/aws/modules/elb/variables.tf b/...ib/terraform/aws/modules/elb/variables.tf → ...ib/terraform/aws/modules/elb/variables.tf
diff --git a/...contrib/terraform/aws/modules/iam/main.tf → ...contrib/terraform/aws/modules/iam/main.tf b/...contrib/terraform/aws/modules/iam/main.tf → ...contrib/terraform/aws/modules/iam/main.tf
diff --git a/...trib/terraform/aws/modules/iam/outputs.tf → ...trib/terraform/aws/modules/iam/outputs.tf b/...trib/terraform/aws/modules/iam/outputs.tf → ...trib/terraform/aws/modules/iam/outputs.tf
diff --git a/...ib/terraform/aws/modules/iam/variables.tf → ...ib/terraform/aws/modules/iam/variables.tf b/...ib/terraform/aws/modules/iam/variables.tf → ...ib/terraform/aws/modules/iam/variables.tf
diff --git a/...contrib/terraform/aws/modules/vpc/main.tf → ...contrib/terraform/aws/modules/vpc/main.tf b/...contrib/terraform/aws/modules/vpc/main.tf → ...contrib/terraform/aws/modules/vpc/main.tf
diff --git a/...trib/terraform/aws/modules/vpc/outputs.tf → ...trib/terraform/aws/modules/vpc/outputs.tf b/...trib/terraform/aws/modules/vpc/outputs.tf → ...trib/terraform/aws/modules/vpc/outputs.tf
diff --git a/...ib/terraform/aws/modules/vpc/variables.tf → ...ib/terraform/aws/modules/vpc/variables.tf b/...ib/terraform/aws/modules/vpc/variables.tf → ...ib/terraform/aws/modules/vpc/variables.tf
diff --git a/kubespray/contrib/terraform/aws/output.tf → ...kubespray/contrib/terraform/aws/output.tf b/kubespray/contrib/terraform/aws/output.tf → ...kubespray/contrib/terraform/aws/output.tf
diff --git a/...rib/terraform/aws/templates/inventory.tpl → ...rib/terraform/aws/templates/inventory.tpl b/...rib/terraform/aws/templates/inventory.tpl → ...rib/terraform/aws/templates/inventory.tpl
diff --git a/...ay/contrib/terraform/aws/terraform.tfvars → ...ay/contrib/terraform/aws/terraform.tfvars b/...ay/contrib/terraform/aws/terraform.tfvars → ...ay/contrib/terraform/aws/terraform.tfvars
diff --git a/...ib/terraform/aws/terraform.tfvars.example → ...ib/terraform/aws/terraform.tfvars.example b/...ib/terraform/aws/terraform.tfvars.example → ...ib/terraform/aws/terraform.tfvars.example
diff --git a/kubespray/contrib/terraform/aws/variables.tf → ...espray/contrib/terraform/aws/variables.tf b/kubespray/contrib/terraform/aws/variables.tf → ...espray/contrib/terraform/aws/variables.tf
diff --git a/kubespray/contrib/terraform/group_vars → ...or/kubespray/contrib/terraform/group_vars b/kubespray/contrib/terraform/group_vars → ...or/kubespray/contrib/terraform/group_vars
diff --git a/...ay/contrib/terraform/openstack/.gitignore → ...ay/contrib/terraform/openstack/.gitignore b/...ay/contrib/terraform/openstack/.gitignore → ...ay/contrib/terraform/openstack/.gitignore
diff --git a/...ray/contrib/terraform/openstack/README.md → ...ray/contrib/terraform/openstack/README.md b/...ray/contrib/terraform/openstack/README.md → ...ray/contrib/terraform/openstack/README.md
diff --git a/...rm/openstack/ansible_bastion_template.txt → ...rm/openstack/ansible_bastion_template.txt b/...rm/openstack/ansible_bastion_template.txt → ...rm/openstack/ansible_bastion_template.txt
diff --git a/kubespray/contrib/terraform/openstack/hosts → ...bespray/contrib/terraform/openstack/hosts b/kubespray/contrib/terraform/openstack/hosts → ...bespray/contrib/terraform/openstack/hosts
diff --git a/.../contrib/terraform/openstack/kubespray.tf → .../contrib/terraform/openstack/kubespray.tf b/.../contrib/terraform/openstack/kubespray.tf → .../contrib/terraform/openstack/kubespray.tf
diff --git a/...rraform/openstack/modules/compute/main.tf → ...rraform/openstack/modules/compute/main.tf b/...rraform/openstack/modules/compute/main.tf → ...rraform/openstack/modules/compute/main.tf
diff --git a/...rm/openstack/modules/compute/variables.tf → ...rm/openstack/modules/compute/variables.tf b/...rm/openstack/modules/compute/variables.tf → ...rm/openstack/modules/compute/variables.tf
diff --git a/...b/terraform/openstack/modules/ips/main.tf → ...b/terraform/openstack/modules/ips/main.tf b/...b/terraform/openstack/modules/ips/main.tf → ...b/terraform/openstack/modules/ips/main.tf
diff --git a/...erraform/openstack/modules/ips/outputs.tf → ...erraform/openstack/modules/ips/outputs.tf b/...erraform/openstack/modules/ips/outputs.tf → ...erraform/openstack/modules/ips/outputs.tf
diff --git a/...raform/openstack/modules/ips/variables.tf → ...raform/openstack/modules/ips/variables.tf b/...raform/openstack/modules/ips/variables.tf → ...raform/openstack/modules/ips/variables.tf
diff --git a/...rraform/openstack/modules/network/main.tf → ...rraform/openstack/modules/network/main.tf b/...rraform/openstack/modules/network/main.tf → ...rraform/openstack/modules/network/main.tf
diff --git a/...form/openstack/modules/network/outputs.tf → ...form/openstack/modules/network/outputs.tf b/...form/openstack/modules/network/outputs.tf → ...form/openstack/modules/network/outputs.tf
diff --git a/...rm/openstack/modules/network/variables.tf → ...rm/openstack/modules/network/variables.tf b/...rm/openstack/modules/network/variables.tf → ...rm/openstack/modules/network/variables.tf
diff --git a/...orm/openstack/sample-inventory/cluster.tf → ...orm/openstack/sample-inventory/cluster.tf b/...orm/openstack/sample-inventory/cluster.tf → ...orm/openstack/sample-inventory/cluster.tf
diff --git a/...orm/openstack/sample-inventory/group_vars → ...orm/openstack/sample-inventory/group_vars b/...orm/openstack/sample-inventory/group_vars → ...orm/openstack/sample-inventory/group_vars
diff --git a/.../contrib/terraform/openstack/variables.tf → .../contrib/terraform/openstack/variables.tf b/.../contrib/terraform/openstack/variables.tf → .../contrib/terraform/openstack/variables.tf
diff --git a/kubespray/contrib/terraform/terraform.py → .../kubespray/contrib/terraform/terraform.py b/kubespray/contrib/terraform/terraform.py → .../kubespray/contrib/terraform/terraform.py
diff --git a/kubespray/docs/ansible.md → vendor/kubespray/docs/ansible.md b/kubespray/docs/ansible.md → vendor/kubespray/docs/ansible.md
diff --git a/kubespray/docs/atomic.md → vendor/kubespray/docs/atomic.md b/kubespray/docs/atomic.md → vendor/kubespray/docs/atomic.md
diff --git a/kubespray/docs/aws.md → vendor/kubespray/docs/aws.md b/kubespray/docs/aws.md → vendor/kubespray/docs/aws.md
diff --git a/kubespray/docs/azure.md → vendor/kubespray/docs/azure.md b/kubespray/docs/azure.md → vendor/kubespray/docs/azure.md
diff --git a/kubespray/docs/calico.md → vendor/kubespray/docs/calico.md b/kubespray/docs/calico.md → vendor/kubespray/docs/calico.md
diff --git a/...ray/docs/calico_peer_example/new-york.yml → ...ray/docs/calico_peer_example/new-york.yml b/...ray/docs/calico_peer_example/new-york.yml → ...ray/docs/calico_peer_example/new-york.yml
diff --git a/kubespray/docs/calico_peer_example/paris.yml → ...espray/docs/calico_peer_example/paris.yml b/kubespray/docs/calico_peer_example/paris.yml → ...espray/docs/calico_peer_example/paris.yml
diff --git a/kubespray/docs/cloud.md → vendor/kubespray/docs/cloud.md b/kubespray/docs/cloud.md → vendor/kubespray/docs/cloud.md
diff --git a/kubespray/docs/comparisons.md → vendor/kubespray/docs/comparisons.md b/kubespray/docs/comparisons.md → vendor/kubespray/docs/comparisons.md
diff --git a/kubespray/docs/contiv.md → vendor/kubespray/docs/contiv.md b/kubespray/docs/contiv.md → vendor/kubespray/docs/contiv.md
diff --git a/kubespray/docs/coreos.md → vendor/kubespray/docs/coreos.md b/kubespray/docs/coreos.md → vendor/kubespray/docs/coreos.md
diff --git a/kubespray/docs/debian.md → vendor/kubespray/docs/debian.md b/kubespray/docs/debian.md → vendor/kubespray/docs/debian.md
diff --git a/kubespray/docs/dns-stack.md → vendor/kubespray/docs/dns-stack.md b/kubespray/docs/dns-stack.md → vendor/kubespray/docs/dns-stack.md
diff --git a/kubespray/docs/downloads.md → vendor/kubespray/docs/downloads.md b/kubespray/docs/downloads.md → vendor/kubespray/docs/downloads.md
diff --git a/...pray/docs/figures/kubespray-calico-rr.png → ...pray/docs/figures/kubespray-calico-rr.png b/...pray/docs/figures/kubespray-calico-rr.png → ...pray/docs/figures/kubespray-calico-rr.png
diff --git a/...y/docs/figures/loadbalancer_localhost.png → ...y/docs/figures/loadbalancer_localhost.png b/...y/docs/figures/loadbalancer_localhost.png → ...y/docs/figures/loadbalancer_localhost.png
diff --git a/kubespray/docs/flannel.md → vendor/kubespray/docs/flannel.md b/kubespray/docs/flannel.md → vendor/kubespray/docs/flannel.md
diff --git a/kubespray/docs/getting-started.md → vendor/kubespray/docs/getting-started.md b/kubespray/docs/getting-started.md → vendor/kubespray/docs/getting-started.md
diff --git a/kubespray/docs/ha-mode.md → vendor/kubespray/docs/ha-mode.md b/kubespray/docs/ha-mode.md → vendor/kubespray/docs/ha-mode.md
diff --git a/kubespray/docs/img/kubernetes-logo.png → ...or/kubespray/docs/img/kubernetes-logo.png b/kubespray/docs/img/kubernetes-logo.png → ...or/kubespray/docs/img/kubernetes-logo.png
diff --git a/kubespray/docs/integration.md → vendor/kubespray/docs/integration.md b/kubespray/docs/integration.md → vendor/kubespray/docs/integration.md
diff --git a/kubespray/docs/kubernetes-reliability.md → .../kubespray/docs/kubernetes-reliability.md b/kubespray/docs/kubernetes-reliability.md → .../kubespray/docs/kubernetes-reliability.md
diff --git a/kubespray/docs/large-deployments.md → vendor/kubespray/docs/large-deployments.md b/kubespray/docs/large-deployments.md → vendor/kubespray/docs/large-deployments.md
diff --git a/kubespray/docs/netcheck.md → vendor/kubespray/docs/netcheck.md b/kubespray/docs/netcheck.md → vendor/kubespray/docs/netcheck.md
diff --git a/kubespray/docs/openstack.md → vendor/kubespray/docs/openstack.md b/kubespray/docs/openstack.md → vendor/kubespray/docs/openstack.md
diff --git a/kubespray/docs/opensuse.md → vendor/kubespray/docs/opensuse.md b/kubespray/docs/opensuse.md → vendor/kubespray/docs/opensuse.md
diff --git a/kubespray/docs/roadmap.md → vendor/kubespray/docs/roadmap.md b/kubespray/docs/roadmap.md → vendor/kubespray/docs/roadmap.md
diff --git a/kubespray/docs/test_cases.md → vendor/kubespray/docs/test_cases.md b/kubespray/docs/test_cases.md → vendor/kubespray/docs/test_cases.md
diff --git a/kubespray/docs/upgrades.md → vendor/kubespray/docs/upgrades.md b/kubespray/docs/upgrades.md → vendor/kubespray/docs/upgrades.md
diff --git a/kubespray/docs/vagrant.md → vendor/kubespray/docs/vagrant.md b/kubespray/docs/vagrant.md → vendor/kubespray/docs/vagrant.md
diff --git a/kubespray/docs/vars.md → vendor/kubespray/docs/vars.md b/kubespray/docs/vars.md → vendor/kubespray/docs/vars.md
diff --git a/kubespray/docs/vault.md → vendor/kubespray/docs/vault.md b/kubespray/docs/vault.md → vendor/kubespray/docs/vault.md
diff --git a/kubespray/docs/vsphere.md → vendor/kubespray/docs/vsphere.md b/kubespray/docs/vsphere.md → vendor/kubespray/docs/vsphere.md
diff --git a/kubespray/docs/weave.md → vendor/kubespray/docs/weave.md b/kubespray/docs/weave.md → vendor/kubespray/docs/weave.md
diff --git a/...ra_playbooks/build-cephfs-provisioner.yml → ...ra_playbooks/build-cephfs-provisioner.yml b/...ra_playbooks/build-cephfs-provisioner.yml → ...ra_playbooks/build-cephfs-provisioner.yml
diff --git a/kubespray/extra_playbooks/inventory → vendor/kubespray/extra_playbooks/inventory b/kubespray/extra_playbooks/inventory → vendor/kubespray/extra_playbooks/inventory
diff --git a/kubespray/extra_playbooks/roles → vendor/kubespray/extra_playbooks/roles b/kubespray/extra_playbooks/roles → vendor/kubespray/extra_playbooks/roles
diff --git a/...pray/extra_playbooks/upgrade-only-k8s.yml → ...pray/extra_playbooks/upgrade-only-k8s.yml b/...pray/extra_playbooks/upgrade-only-k8s.yml → ...pray/extra_playbooks/upgrade-only-k8s.yml
diff --git a/vendor/kubespray/group_vars b/vendor/kubespray/group_vars
@@ -0,0 +1 @@
+../../group_vars/
diff --git a/kubespray/inventory/local/group_vars → vendor/kubespray/inventory/local/group_vars b/kubespray/inventory/local/group_vars → vendor/kubespray/inventory/local/group_vars
diff --git a/kubespray/inventory/local/hosts.ini → vendor/kubespray/inventory/local/hosts.ini b/kubespray/inventory/local/hosts.ini → vendor/kubespray/inventory/local/hosts.ini
diff --git a/...spray/inventory/sample/group_vars/all.yml → ...spray/inventory/sample/group_vars/all.yml b/...spray/inventory/sample/group_vars/all.yml → ...spray/inventory/sample/group_vars/all.yml
diff --git a/...ventory/sample/group_vars/k8s-cluster.yml → ...ventory/sample/group_vars/k8s-cluster.yml b/...ventory/sample/group_vars/k8s-cluster.yml → ...ventory/sample/group_vars/k8s-cluster.yml
diff --git a/kubespray/inventory/sample/hosts.ini → vendor/kubespray/inventory/sample/hosts.ini b/kubespray/inventory/sample/hosts.ini → vendor/kubespray/inventory/sample/hosts.ini
diff --git a/kubespray/library/kube.py → vendor/kubespray/library/kube.py b/kubespray/library/kube.py → vendor/kubespray/library/kube.py
diff --git a/kubespray/remove-node.yml → vendor/kubespray/remove-node.yml b/kubespray/remove-node.yml → vendor/kubespray/remove-node.yml
diff --git a/kubespray/requirements.txt → vendor/kubespray/requirements.txt b/kubespray/requirements.txt → vendor/kubespray/requirements.txt
diff --git a/kubespray/reset.yml → vendor/kubespray/reset.yml b/kubespray/reset.yml → vendor/kubespray/reset.yml
diff --git a/kubespray/roles/adduser/defaults/main.yml → ...kubespray/roles/adduser/defaults/main.yml b/kubespray/roles/adduser/defaults/main.yml → ...kubespray/roles/adduser/defaults/main.yml
diff --git a/kubespray/roles/adduser/tasks/main.yml → ...or/kubespray/roles/adduser/tasks/main.yml b/kubespray/roles/adduser/tasks/main.yml → ...or/kubespray/roles/adduser/tasks/main.yml
diff --git a/kubespray/roles/adduser/vars/coreos.yml → ...r/kubespray/roles/adduser/vars/coreos.yml b/kubespray/roles/adduser/vars/coreos.yml → ...r/kubespray/roles/adduser/vars/coreos.yml
diff --git a/kubespray/roles/adduser/vars/debian.yml → ...r/kubespray/roles/adduser/vars/debian.yml b/kubespray/roles/adduser/vars/debian.yml → ...r/kubespray/roles/adduser/vars/debian.yml
diff --git a/kubespray/roles/adduser/vars/redhat.yml → ...r/kubespray/roles/adduser/vars/redhat.yml b/kubespray/roles/adduser/vars/redhat.yml → ...r/kubespray/roles/adduser/vars/redhat.yml
diff --git a/...y/roles/bastion-ssh-config/tasks/main.yml → ...y/roles/bastion-ssh-config/tasks/main.yml b/...y/roles/bastion-ssh-config/tasks/main.yml → ...y/roles/bastion-ssh-config/tasks/main.yml
diff --git a/...ion-ssh-config/templates/ssh-bastion.conf → ...ion-ssh-config/templates/ssh-bastion.conf b/...ion-ssh-config/templates/ssh-bastion.conf → ...ion-ssh-config/templates/ssh-bastion.conf
diff --git a/...pray/roles/bootstrap-os/defaults/main.yml → ...pray/roles/bootstrap-os/defaults/main.yml b/...pray/roles/bootstrap-os/defaults/main.yml → ...pray/roles/bootstrap-os/defaults/main.yml
diff --git a/...ray/roles/bootstrap-os/files/bootstrap.sh → ...ray/roles/bootstrap-os/files/bootstrap.sh b/...ray/roles/bootstrap-os/files/bootstrap.sh → ...ray/roles/bootstrap-os/files/bootstrap.sh
diff --git a/...spray/roles/bootstrap-os/files/get-pip.py → ...spray/roles/bootstrap-os/files/get-pip.py b/...spray/roles/bootstrap-os/files/get-pip.py → ...spray/roles/bootstrap-os/files/get-pip.py
diff --git a/kubespray/roles/bootstrap-os/files/runner → ...kubespray/roles/bootstrap-os/files/runner b/kubespray/roles/bootstrap-os/files/runner → ...kubespray/roles/bootstrap-os/files/runner
diff --git a/...s/bootstrap-os/tasks/bootstrap-centos.yml → ...s/bootstrap-os/tasks/bootstrap-centos.yml b/...s/bootstrap-os/tasks/bootstrap-centos.yml → ...s/bootstrap-os/tasks/bootstrap-centos.yml
diff --git a/...s/bootstrap-os/tasks/bootstrap-coreos.yml → ...s/bootstrap-os/tasks/bootstrap-coreos.yml b/...s/bootstrap-os/tasks/bootstrap-coreos.yml → ...s/bootstrap-os/tasks/bootstrap-coreos.yml
diff --git a/...s/bootstrap-os/tasks/bootstrap-debian.yml → ...s/bootstrap-os/tasks/bootstrap-debian.yml b/...s/bootstrap-os/tasks/bootstrap-debian.yml → ...s/bootstrap-os/tasks/bootstrap-debian.yml
diff --git a/...bootstrap-os/tasks/bootstrap-opensuse.yml → ...bootstrap-os/tasks/bootstrap-opensuse.yml b/...bootstrap-os/tasks/bootstrap-opensuse.yml → ...bootstrap-os/tasks/bootstrap-opensuse.yml
diff --git a/...s/bootstrap-os/tasks/bootstrap-ubuntu.yml → ...s/bootstrap-os/tasks/bootstrap-ubuntu.yml b/...s/bootstrap-os/tasks/bootstrap-ubuntu.yml → ...s/bootstrap-os/tasks/bootstrap-ubuntu.yml
diff --git a/kubespray/roles/bootstrap-os/tasks/main.yml → ...bespray/roles/bootstrap-os/tasks/main.yml b/kubespray/roles/bootstrap-os/tasks/main.yml → ...bespray/roles/bootstrap-os/tasks/main.yml
diff --git a/...s/bootstrap-os/tasks/setup-pipelining.yml → ...s/bootstrap-os/tasks/setup-pipelining.yml b/...s/bootstrap-os/tasks/setup-pipelining.yml → ...s/bootstrap-os/tasks/setup-pipelining.yml
diff --git a/...les/bootstrap-os/templates/python_shim.j2 → ...les/bootstrap-os/templates/python_shim.j2 b/...les/bootstrap-os/templates/python_shim.j2 → ...les/bootstrap-os/templates/python_shim.j2
diff --git a/kubespray/roles/dnsmasq/defaults/main.yml → ...kubespray/roles/dnsmasq/defaults/main.yml b/kubespray/roles/dnsmasq/defaults/main.yml → ...kubespray/roles/dnsmasq/defaults/main.yml
diff --git a/kubespray/roles/dnsmasq/tasks/main.yml → ...or/kubespray/roles/dnsmasq/tasks/main.yml b/kubespray/roles/dnsmasq/tasks/main.yml → ...or/kubespray/roles/dnsmasq/tasks/main.yml
diff --git a/...les/dnsmasq/templates/01-kube-dns.conf.j2 → ...les/dnsmasq/templates/01-kube-dns.conf.j2 b/...les/dnsmasq/templates/01-kube-dns.conf.j2 → ...les/dnsmasq/templates/01-kube-dns.conf.j2
diff --git a/...smasq/templates/dnsmasq-autoscaler.yml.j2 → ...smasq/templates/dnsmasq-autoscaler.yml.j2 b/...smasq/templates/dnsmasq-autoscaler.yml.j2 → ...smasq/templates/dnsmasq-autoscaler.yml.j2
diff --git a/.../templates/dnsmasq-clusterrolebinding.yml → .../templates/dnsmasq-clusterrolebinding.yml b/.../templates/dnsmasq-clusterrolebinding.yml → .../templates/dnsmasq-clusterrolebinding.yml
diff --git a/...oles/dnsmasq/templates/dnsmasq-deploy.yml → ...oles/dnsmasq/templates/dnsmasq-deploy.yml b/...oles/dnsmasq/templates/dnsmasq-deploy.yml → ...oles/dnsmasq/templates/dnsmasq-deploy.yml
diff --git a/...masq/templates/dnsmasq-serviceaccount.yml → ...masq/templates/dnsmasq-serviceaccount.yml b/...masq/templates/dnsmasq-serviceaccount.yml → ...masq/templates/dnsmasq-serviceaccount.yml
diff --git a/...y/roles/dnsmasq/templates/dnsmasq-svc.yml → ...y/roles/dnsmasq/templates/dnsmasq-svc.yml b/...y/roles/dnsmasq/templates/dnsmasq-svc.yml → ...y/roles/dnsmasq/templates/dnsmasq-svc.yml
diff --git a/kubespray/roles/docker/.gitignore → vendor/kubespray/roles/docker/.gitignore b/kubespray/roles/docker/.gitignore → vendor/kubespray/roles/docker/.gitignore
diff --git a/kubespray/roles/docker/defaults/main.yml → .../kubespray/roles/docker/defaults/main.yml b/kubespray/roles/docker/defaults/main.yml → .../kubespray/roles/docker/defaults/main.yml
diff --git a/...s/docker/docker-storage/defaults/main.yml → ...s/docker/docker-storage/defaults/main.yml b/...s/docker/docker-storage/defaults/main.yml → ...s/docker/docker-storage/defaults/main.yml
diff --git a/.../files/install_container_storage_setup.sh → .../files/install_container_storage_setup.sh b/.../files/install_container_storage_setup.sh → .../files/install_container_storage_setup.sh
diff --git a/...oles/docker/docker-storage/tasks/main.yml → ...oles/docker/docker-storage/tasks/main.yml b/...oles/docker/docker-storage/tasks/main.yml → ...oles/docker/docker-storage/tasks/main.yml
diff --git a/...storage/templates/docker-storage-setup.j2 → ...storage/templates/docker-storage-setup.j2 b/...storage/templates/docker-storage-setup.j2 → ...storage/templates/docker-storage-setup.j2
diff --git a/kubespray/roles/docker/handlers/main.yml → .../kubespray/roles/docker/handlers/main.yml b/kubespray/roles/docker/handlers/main.yml → .../kubespray/roles/docker/handlers/main.yml
diff --git a/kubespray/roles/docker/meta/main.yml → vendor/kubespray/roles/docker/meta/main.yml b/kubespray/roles/docker/meta/main.yml → vendor/kubespray/roles/docker/meta/main.yml
diff --git a/kubespray/roles/docker/tasks/main.yml → vendor/kubespray/roles/docker/tasks/main.yml b/kubespray/roles/docker/tasks/main.yml → vendor/kubespray/roles/docker/tasks/main.yml
diff --git a/kubespray/roles/docker/tasks/pre-upgrade.yml → ...espray/roles/docker/tasks/pre-upgrade.yml b/kubespray/roles/docker/tasks/pre-upgrade.yml → ...espray/roles/docker/tasks/pre-upgrade.yml
diff --git a/...pray/roles/docker/tasks/set_facts_dns.yml → ...pray/roles/docker/tasks/set_facts_dns.yml b/...pray/roles/docker/tasks/set_facts_dns.yml → ...pray/roles/docker/tasks/set_facts_dns.yml
diff --git a/kubespray/roles/docker/tasks/systemd.yml → .../kubespray/roles/docker/tasks/systemd.yml b/kubespray/roles/docker/tasks/systemd.yml → .../kubespray/roles/docker/tasks/systemd.yml
diff --git a/...roles/docker/templates/docker-dns.conf.j2 → ...roles/docker/templates/docker-dns.conf.j2 b/...roles/docker/templates/docker-dns.conf.j2 → ...roles/docker/templates/docker-dns.conf.j2
diff --git a/...s/docker/templates/docker-options.conf.j2 → ...s/docker/templates/docker-options.conf.j2 b/...s/docker/templates/docker-options.conf.j2 → ...s/docker/templates/docker-options.conf.j2
diff --git a/.../roles/docker/templates/docker.service.j2 → .../roles/docker/templates/docker.service.j2 b/.../roles/docker/templates/docker.service.j2 → .../roles/docker/templates/docker.service.j2
diff --git a/...roles/docker/templates/http-proxy.conf.j2 → ...roles/docker/templates/http-proxy.conf.j2 b/...roles/docker/templates/http-proxy.conf.j2 → ...roles/docker/templates/http-proxy.conf.j2
diff --git a/.../roles/docker/templates/rh_docker.repo.j2 → .../roles/docker/templates/rh_docker.repo.j2 b/.../roles/docker/templates/rh_docker.repo.j2 → .../roles/docker/templates/rh_docker.repo.j2
diff --git a/kubespray/roles/docker/vars/debian.yml → ...or/kubespray/roles/docker/vars/debian.yml b/kubespray/roles/docker/vars/debian.yml → ...or/kubespray/roles/docker/vars/debian.yml
diff --git a/kubespray/roles/docker/vars/redhat.yml → ...or/kubespray/roles/docker/vars/redhat.yml b/kubespray/roles/docker/vars/redhat.yml → ...or/kubespray/roles/docker/vars/redhat.yml
diff --git a/kubespray/roles/docker/vars/suse.yml → vendor/kubespray/roles/docker/vars/suse.yml b/kubespray/roles/docker/vars/suse.yml → vendor/kubespray/roles/docker/vars/suse.yml
diff --git a/kubespray/roles/docker/vars/ubuntu.yml → ...or/kubespray/roles/docker/vars/ubuntu.yml b/kubespray/roles/docker/vars/ubuntu.yml → ...or/kubespray/roles/docker/vars/ubuntu.yml
diff --git a/kubespray/roles/download/defaults/main.yml → ...ubespray/roles/download/defaults/main.yml b/kubespray/roles/download/defaults/main.yml → ...ubespray/roles/download/defaults/main.yml
diff --git a/kubespray/roles/download/meta/main.yml → ...or/kubespray/roles/download/meta/main.yml b/kubespray/roles/download/meta/main.yml → ...or/kubespray/roles/download/meta/main.yml
diff --git a/...les/download/tasks/download_container.yml → ...les/download/tasks/download_container.yml b/...les/download/tasks/download_container.yml → ...les/download/tasks/download_container.yml
diff --git a/...ay/roles/download/tasks/download_file.yml → ...ay/roles/download/tasks/download_file.yml b/...ay/roles/download/tasks/download_file.yml → ...ay/roles/download/tasks/download_file.yml
diff --git a/...ay/roles/download/tasks/download_prep.yml → ...ay/roles/download/tasks/download_prep.yml b/...ay/roles/download/tasks/download_prep.yml → ...ay/roles/download/tasks/download_prep.yml
diff --git a/kubespray/roles/download/tasks/main.yml → ...r/kubespray/roles/download/tasks/main.yml b/kubespray/roles/download/tasks/main.yml → ...r/kubespray/roles/download/tasks/main.yml
diff --git a/...download/tasks/set_docker_image_facts.yml → ...download/tasks/set_docker_image_facts.yml b/...download/tasks/set_docker_image_facts.yml → ...download/tasks/set_docker_image_facts.yml
diff --git a/...y/roles/download/tasks/sync_container.yml → ...y/roles/download/tasks/sync_container.yml b/...y/roles/download/tasks/sync_container.yml → ...y/roles/download/tasks/sync_container.yml
diff --git a/kubespray/roles/etcd/defaults/main.yml → ...or/kubespray/roles/etcd/defaults/main.yml b/kubespray/roles/etcd/defaults/main.yml → ...or/kubespray/roles/etcd/defaults/main.yml
diff --git a/kubespray/roles/etcd/files/make-ssl-etcd.sh → ...bespray/roles/etcd/files/make-ssl-etcd.sh b/kubespray/roles/etcd/files/make-ssl-etcd.sh → ...bespray/roles/etcd/files/make-ssl-etcd.sh
diff --git a/kubespray/roles/etcd/handlers/backup.yml → .../kubespray/roles/etcd/handlers/backup.yml b/kubespray/roles/etcd/handlers/backup.yml → .../kubespray/roles/etcd/handlers/backup.yml
diff --git a/kubespray/roles/etcd/handlers/main.yml → ...or/kubespray/roles/etcd/handlers/main.yml b/kubespray/roles/etcd/handlers/main.yml → ...or/kubespray/roles/etcd/handlers/main.yml
diff --git a/kubespray/roles/etcd/meta/main.yml → vendor/kubespray/roles/etcd/meta/main.yml b/kubespray/roles/etcd/meta/main.yml → vendor/kubespray/roles/etcd/meta/main.yml
diff --git a/kubespray/roles/etcd/tasks/check_certs.yml → ...ubespray/roles/etcd/tasks/check_certs.yml b/kubespray/roles/etcd/tasks/check_certs.yml → ...ubespray/roles/etcd/tasks/check_certs.yml
diff --git a/kubespray/roles/etcd/tasks/configure.yml → .../kubespray/roles/etcd/tasks/configure.yml b/kubespray/roles/etcd/tasks/configure.yml → .../kubespray/roles/etcd/tasks/configure.yml
diff --git a/...ray/roles/etcd/tasks/gen_certs_script.yml → ...ray/roles/etcd/tasks/gen_certs_script.yml b/...ray/roles/etcd/tasks/gen_certs_script.yml → ...ray/roles/etcd/tasks/gen_certs_script.yml
diff --git a/...pray/roles/etcd/tasks/gen_certs_vault.yml → ...pray/roles/etcd/tasks/gen_certs_vault.yml b/...pray/roles/etcd/tasks/gen_certs_vault.yml → ...pray/roles/etcd/tasks/gen_certs_vault.yml
diff --git a/...spray/roles/etcd/tasks/install_docker.yml → ...spray/roles/etcd/tasks/install_docker.yml b/...spray/roles/etcd/tasks/install_docker.yml → ...spray/roles/etcd/tasks/install_docker.yml
diff --git a/kubespray/roles/etcd/tasks/install_host.yml → ...bespray/roles/etcd/tasks/install_host.yml b/kubespray/roles/etcd/tasks/install_host.yml → ...bespray/roles/etcd/tasks/install_host.yml
diff --git a/kubespray/roles/etcd/tasks/install_rkt.yml → ...ubespray/roles/etcd/tasks/install_rkt.yml b/kubespray/roles/etcd/tasks/install_rkt.yml → ...ubespray/roles/etcd/tasks/install_rkt.yml
diff --git a/...es/etcd/tasks/join_etcd-events_member.yml → ...es/etcd/tasks/join_etcd-events_member.yml b/...es/etcd/tasks/join_etcd-events_member.yml → ...es/etcd/tasks/join_etcd-events_member.yml
diff --git a/...ray/roles/etcd/tasks/join_etcd_member.yml → ...ray/roles/etcd/tasks/join_etcd_member.yml b/...ray/roles/etcd/tasks/join_etcd_member.yml → ...ray/roles/etcd/tasks/join_etcd_member.yml
diff --git a/kubespray/roles/etcd/tasks/main.yml → vendor/kubespray/roles/etcd/tasks/main.yml b/kubespray/roles/etcd/tasks/main.yml → vendor/kubespray/roles/etcd/tasks/main.yml
diff --git a/...spray/roles/etcd/tasks/refresh_config.yml → ...spray/roles/etcd/tasks/refresh_config.yml b/...spray/roles/etcd/tasks/refresh_config.yml → ...spray/roles/etcd/tasks/refresh_config.yml
diff --git a/...les/etcd/tasks/sync_etcd_master_certs.yml → ...les/etcd/tasks/sync_etcd_master_certs.yml b/...les/etcd/tasks/sync_etcd_master_certs.yml → ...les/etcd/tasks/sync_etcd_master_certs.yml
diff --git a/...roles/etcd/tasks/sync_etcd_node_certs.yml → ...roles/etcd/tasks/sync_etcd_node_certs.yml b/...roles/etcd/tasks/sync_etcd_node_certs.yml → ...roles/etcd/tasks/sync_etcd_node_certs.yml
diff --git a/kubespray/roles/etcd/tasks/upd_ca_trust.yml → ...bespray/roles/etcd/tasks/upd_ca_trust.yml b/kubespray/roles/etcd/tasks/upd_ca_trust.yml → ...bespray/roles/etcd/tasks/upd_ca_trust.yml
diff --git a/...les/etcd/templates/etcd-docker.service.j2 → ...les/etcd/templates/etcd-docker.service.j2 b/...les/etcd/templates/etcd-docker.service.j2 → ...les/etcd/templates/etcd-docker.service.j2
diff --git a/...d/templates/etcd-events-docker.service.j2 → ...d/templates/etcd-events-docker.service.j2 b/...d/templates/etcd-events-docker.service.j2 → ...d/templates/etcd-events-docker.service.j2
diff --git a/...tcd/templates/etcd-events-host.service.j2 → ...tcd/templates/etcd-events-host.service.j2 b/...tcd/templates/etcd-events-host.service.j2 → ...tcd/templates/etcd-events-host.service.j2
diff --git a/...etcd/templates/etcd-events-rkt.service.j2 → ...etcd/templates/etcd-events-rkt.service.j2 b/...etcd/templates/etcd-events-rkt.service.j2 → ...etcd/templates/etcd-events-rkt.service.j2
diff --git a/...y/roles/etcd/templates/etcd-events.env.j2 → ...y/roles/etcd/templates/etcd-events.env.j2 b/...y/roles/etcd/templates/etcd-events.env.j2 → ...y/roles/etcd/templates/etcd-events.env.j2
diff --git a/...spray/roles/etcd/templates/etcd-events.j2 → ...spray/roles/etcd/templates/etcd-events.j2 b/...spray/roles/etcd/templates/etcd-events.j2 → ...spray/roles/etcd/templates/etcd-events.j2
diff --git a/...roles/etcd/templates/etcd-host.service.j2 → ...roles/etcd/templates/etcd-host.service.j2 b/...roles/etcd/templates/etcd-host.service.j2 → ...roles/etcd/templates/etcd-host.service.j2
diff --git a/.../roles/etcd/templates/etcd-rkt.service.j2 → .../roles/etcd/templates/etcd-rkt.service.j2 b/.../roles/etcd/templates/etcd-rkt.service.j2 → .../roles/etcd/templates/etcd-rkt.service.j2
diff --git a/kubespray/roles/etcd/templates/etcd.env.j2 → ...ubespray/roles/etcd/templates/etcd.env.j2 b/kubespray/roles/etcd/templates/etcd.env.j2 → ...ubespray/roles/etcd/templates/etcd.env.j2
diff --git a/kubespray/roles/etcd/templates/etcd.j2 → ...or/kubespray/roles/etcd/templates/etcd.j2 b/kubespray/roles/etcd/templates/etcd.j2 → ...or/kubespray/roles/etcd/templates/etcd.j2
diff --git a/...pray/roles/etcd/templates/openssl.conf.j2 → ...pray/roles/etcd/templates/openssl.conf.j2 b/...pray/roles/etcd/templates/openssl.conf.j2 → ...pray/roles/etcd/templates/openssl.conf.j2
diff --git a/...kubernetes-apps/ansible/defaults/main.yml → ...kubernetes-apps/ansible/defaults/main.yml b/...kubernetes-apps/ansible/defaults/main.yml → ...kubernetes-apps/ansible/defaults/main.yml
diff --git a/...rnetes-apps/ansible/tasks/cleanup_dns.yml → ...rnetes-apps/ansible/tasks/cleanup_dns.yml b/...rnetes-apps/ansible/tasks/cleanup_dns.yml → ...rnetes-apps/ansible/tasks/cleanup_dns.yml
diff --git a/...kubernetes-apps/ansible/tasks/coredns.yml → ...kubernetes-apps/ansible/tasks/coredns.yml b/...kubernetes-apps/ansible/tasks/coredns.yml → ...kubernetes-apps/ansible/tasks/coredns.yml
diff --git a/...bernetes-apps/ansible/tasks/dashboard.yml → ...bernetes-apps/ansible/tasks/dashboard.yml b/...bernetes-apps/ansible/tasks/dashboard.yml → ...bernetes-apps/ansible/tasks/dashboard.yml
diff --git a/...kubernetes-apps/ansible/tasks/kubedns.yml → ...kubernetes-apps/ansible/tasks/kubedns.yml b/...kubernetes-apps/ansible/tasks/kubedns.yml → ...kubernetes-apps/ansible/tasks/kubedns.yml
diff --git a/...es/kubernetes-apps/ansible/tasks/main.yml → ...es/kubernetes-apps/ansible/tasks/main.yml b/...es/kubernetes-apps/ansible/tasks/main.yml → ...es/kubernetes-apps/ansible/tasks/main.yml
diff --git a/...ernetes-apps/ansible/tasks/netchecker.yml → ...ernetes-apps/ansible/tasks/netchecker.yml b/...ernetes-apps/ansible/tasks/netchecker.yml → ...ernetes-apps/ansible/tasks/netchecker.yml
diff --git a/...ible/templates/coredns-clusterrole.yml.j2 → ...ible/templates/coredns-clusterrole.yml.j2 b/...ible/templates/coredns-clusterrole.yml.j2 → ...ible/templates/coredns-clusterrole.yml.j2
diff --git a/...mplates/coredns-clusterrolebinding.yml.j2 → ...mplates/coredns-clusterrolebinding.yml.j2 b/...mplates/coredns-clusterrolebinding.yml.j2 → ...mplates/coredns-clusterrolebinding.yml.j2
diff --git a/...s/ansible/templates/coredns-config.yml.j2 → ...s/ansible/templates/coredns-config.yml.j2 b/...s/ansible/templates/coredns-config.yml.j2 → ...s/ansible/templates/coredns-config.yml.j2
diff --git a/...sible/templates/coredns-deployment.yml.j2 → ...sible/templates/coredns-deployment.yml.j2 b/...sible/templates/coredns-deployment.yml.j2 → ...sible/templates/coredns-deployment.yml.j2
diff --git a/...-apps/ansible/templates/coredns-sa.yml.j2 → ...-apps/ansible/templates/coredns-sa.yml.j2 b/...-apps/ansible/templates/coredns-sa.yml.j2 → ...-apps/ansible/templates/coredns-sa.yml.j2
diff --git a/...apps/ansible/templates/coredns-svc.yml.j2 → ...apps/ansible/templates/coredns-svc.yml.j2 b/...apps/ansible/templates/coredns-svc.yml.j2 → ...apps/ansible/templates/coredns-svc.yml.j2
diff --git a/...s-apps/ansible/templates/dashboard.yml.j2 → ...s-apps/ansible/templates/dashboard.yml.j2 b/...s-apps/ansible/templates/dashboard.yml.j2 → ...s-apps/ansible/templates/dashboard.yml.j2
diff --git a/...tes/kubedns-autoscaler-clusterrole.yml.j2 → ...tes/kubedns-autoscaler-clusterrole.yml.j2 b/...tes/kubedns-autoscaler-clusterrole.yml.j2 → ...tes/kubedns-autoscaler-clusterrole.yml.j2
diff --git a/...edns-autoscaler-clusterrolebinding.yml.j2 → ...edns-autoscaler-clusterrolebinding.yml.j2 b/...edns-autoscaler-clusterrolebinding.yml.j2 → ...edns-autoscaler-clusterrolebinding.yml.j2
diff --git a/...le/templates/kubedns-autoscaler-sa.yml.j2 → ...le/templates/kubedns-autoscaler-sa.yml.j2 b/...le/templates/kubedns-autoscaler-sa.yml.j2 → ...le/templates/kubedns-autoscaler-sa.yml.j2
diff --git a/...sible/templates/kubedns-autoscaler.yml.j2 → ...sible/templates/kubedns-autoscaler.yml.j2 b/...sible/templates/kubedns-autoscaler.yml.j2 → ...sible/templates/kubedns-autoscaler.yml.j2
diff --git a/...s/ansible/templates/kubedns-deploy.yml.j2 → ...s/ansible/templates/kubedns-deploy.yml.j2 b/...s/ansible/templates/kubedns-deploy.yml.j2 → ...s/ansible/templates/kubedns-deploy.yml.j2
diff --git a/...-apps/ansible/templates/kubedns-sa.yml.j2 → ...-apps/ansible/templates/kubedns-sa.yml.j2 b/...-apps/ansible/templates/kubedns-sa.yml.j2 → ...-apps/ansible/templates/kubedns-sa.yml.j2
diff --git a/...apps/ansible/templates/kubedns-svc.yml.j2 → ...apps/ansible/templates/kubedns-svc.yml.j2 b/...apps/ansible/templates/kubedns-svc.yml.j2 → ...apps/ansible/templates/kubedns-svc.yml.j2
diff --git a/...ible/templates/netchecker-agent-ds.yml.j2 → ...ible/templates/netchecker-agent-ds.yml.j2 b/...ible/templates/netchecker-agent-ds.yml.j2 → ...ible/templates/netchecker-agent-ds.yml.j2
diff --git a/...plates/netchecker-agent-hostnet-ds.yml.j2 → ...plates/netchecker-agent-hostnet-ds.yml.j2 b/...plates/netchecker-agent-hostnet-ds.yml.j2 → ...plates/netchecker-agent-hostnet-ds.yml.j2
diff --git a/...ates/netchecker-server-clusterrole.yml.j2 → ...ates/netchecker-server-clusterrole.yml.j2 b/...ates/netchecker-server-clusterrole.yml.j2 → ...ates/netchecker-server-clusterrole.yml.j2
diff --git a/...tchecker-server-clusterrolebinding.yml.j2 → ...tchecker-server-clusterrolebinding.yml.j2 b/...tchecker-server-clusterrolebinding.yml.j2 → ...tchecker-server-clusterrolebinding.yml.j2
diff --git a/...lates/netchecker-server-deployment.yml.j2 → ...lates/netchecker-server-deployment.yml.j2 b/...lates/netchecker-server-deployment.yml.j2 → ...lates/netchecker-server-deployment.yml.j2
diff --git a/...ble/templates/netchecker-server-sa.yml.j2 → ...ble/templates/netchecker-server-sa.yml.j2 b/...ble/templates/netchecker-server-sa.yml.j2 → ...ble/templates/netchecker-server-sa.yml.j2
diff --git a/...le/templates/netchecker-server-svc.yml.j2 → ...le/templates/netchecker-server-svc.yml.j2 b/...le/templates/netchecker-server-svc.yml.j2 → ...le/templates/netchecker-server-svc.yml.j2
diff --git a/...ernetes-apps/cluster_roles/tasks/main.yml → ...ernetes-apps/cluster_roles/tasks/main.yml b/...ernetes-apps/cluster_roles/tasks/main.yml → ...ernetes-apps/cluster_roles/tasks/main.yml
diff --git a/...apps/cluster_roles/templates/namespace.j2 → ...apps/cluster_roles/templates/namespace.j2 b/...apps/cluster_roles/templates/namespace.j2 → ...apps/cluster_roles/templates/namespace.j2
diff --git a/...s/cluster_roles/templates/node-crb.yml.j2 → ...s/cluster_roles/templates/node-crb.yml.j2 b/...s/cluster_roles/templates/node-crb.yml.j2 → ...s/cluster_roles/templates/node-crb.yml.j2
diff --git a/...er_roles/templates/node-webhook-cr.yml.j2 → ...er_roles/templates/node-webhook-cr.yml.j2 b/...er_roles/templates/node-webhook-cr.yml.j2 → ...er_roles/templates/node-webhook-cr.yml.j2
diff --git a/...r_roles/templates/node-webhook-crb.yml.j2 → ...r_roles/templates/node-webhook-crb.yml.j2 b/...r_roles/templates/node-webhook-crb.yml.j2 → ...r_roles/templates/node-webhook-crb.yml.j2
diff --git a/...uster_roles/templates/vsphere-rbac.yml.j2 → ...uster_roles/templates/vsphere-rbac.yml.j2 b/...uster_roles/templates/vsphere-rbac.yml.j2 → ...uster_roles/templates/vsphere-rbac.yml.j2
diff --git a/...-apps/efk/elasticsearch/defaults/main.yml → ...-apps/efk/elasticsearch/defaults/main.yml b/...-apps/efk/elasticsearch/defaults/main.yml → ...-apps/efk/elasticsearch/defaults/main.yml