From a3c88a0de55dcf86caf7d4f05cb4a5240dd9d5db Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Fri, 16 Jun 2017 12:18:35 -0400 Subject: [PATCH] rename kargo mentions in top-level yml files --- cluster.yml | 24 ++++++++++++------------ reset.yml | 2 +- scale.yml | 4 ++-- upgrade-cluster.yml | 28 ++++++++++++++-------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster.yml b/cluster.yml index 75296646a..b973d6c14 100644 --- a/cluster.yml +++ b/cluster.yml @@ -2,7 +2,7 @@ - hosts: localhost gather_facts: False roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: bastion-ssh-config, tags: ["localhost", "bastion"]} - hosts: k8s-cluster:etcd:calico-rr @@ -13,7 +13,7 @@ # fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled. ansible_ssh_pipelining: false roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} - hosts: k8s-cluster:etcd:calico-rr @@ -25,7 +25,7 @@ - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kernel-upgrade, tags: kernel-upgrade, when: kernel_upgrade is defined and kernel_upgrade } - { role: kubernetes/preinstall, tags: preinstall } - { role: docker, tags: docker } @@ -36,38 +36,38 @@ - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults, when: "cert_management == 'vault'" } + - { role: kubespray-defaults, when: "cert_management == 'vault'" } - { role: vault, tags: vault, vault_bootstrap: true, when: "cert_management == 'vault'" } - hosts: etcd any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: true } - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: false } - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: vault, tags: vault, when: "cert_management == 'vault'"} - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kubernetes/node, tags: node } - { role: network_plugin, tags: network } - hosts: kube-master any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kubernetes/master, tags: master } - { role: kubernetes-apps/network_plugin, tags: network } - { role: kubernetes-apps/policy_controller, tags: policy-controller } @@ -75,18 +75,18 @@ - hosts: calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: network_plugin/calico/rr, tags: network } - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: dnsmasq, when: "dns_mode == 'dnsmasq_kubedns'", tags: dnsmasq } - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf } - hosts: kube-master[0] any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kubernetes-apps, tags: apps } diff --git a/reset.yml b/reset.yml index b6e15d828..859ca6264 100644 --- a/reset.yml +++ b/reset.yml @@ -14,5 +14,5 @@ when: reset_confirmation != "yes" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: reset, tags: reset } diff --git a/scale.yml b/scale.yml index 02e79aa37..49445cabc 100644 --- a/scale.yml +++ b/scale.yml @@ -7,7 +7,7 @@ vars: ansible_ssh_pipelining: false roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} ##We still have to gather facts about our masters and etcd nodes @@ -21,7 +21,7 @@ - hosts: kube-node any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kernel-upgrade, tags: kernel-upgrade, when: kernel_upgrade is defined and kernel_upgrade } - { role: kubernetes/preinstall, tags: preinstall } - { role: docker, tags: docker } diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index 0b4613820..09f268ecf 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -2,7 +2,7 @@ - hosts: localhost gather_facts: False roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: bastion-ssh-config, tags: ["localhost", "bastion"]} - hosts: k8s-cluster:etcd:calico-rr @@ -13,7 +13,7 @@ # fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled. ansible_ssh_pipelining: false roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} - hosts: k8s-cluster:etcd:calico-rr @@ -25,7 +25,7 @@ - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kernel-upgrade, tags: kernel-upgrade, when: kernel_upgrade is defined and kernel_upgrade } - { role: kubernetes/preinstall, tags: preinstall } - { role: docker, tags: docker } @@ -36,25 +36,25 @@ - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults, when: "cert_management == 'vault'" } + - { role: kubespray-defaults, when: "cert_management == 'vault'" } - { role: vault, tags: vault, vault_bootstrap: true, when: "cert_management == 'vault'" } - hosts: etcd any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: true } - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: etcd, tags: etcd, etcd_cluster_setup: false } - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults, when: "cert_management == 'vault'"} + - { role: kubespray-defaults, when: "cert_management == 'vault'"} - { role: vault, tags: vault, when: "cert_management == 'vault'"} #Handle upgrades to master components first to maintain backwards compat. @@ -62,7 +62,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" serial: 1 roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: kubernetes/node, tags: node } - { role: kubernetes/master, tags: master } @@ -73,35 +73,35 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" serial: "{{ serial | default('20%') }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: kubernetes/node, tags: node } - { role: network_plugin, tags: network } - { role: upgrade/post-upgrade, tags: post-upgrade } - - { role: kargo-defaults} + - { role: kubespray-defaults} - hosts: kube-master any_errors_fatal: true roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kubernetes-apps/network_plugin, tags: network } - { role: kubernetes-apps/policy_controller, tags: policy-controller } - hosts: calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: network_plugin/calico/rr, tags: network } - hosts: k8s-cluster any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: dnsmasq, when: "dns_mode == 'dnsmasq_kubedns'", tags: dnsmasq } - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf } - hosts: kube-master[0] any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kargo-defaults} + - { role: kubespray-defaults} - { role: kubernetes-apps, tags: apps }