Merge "Move topology-manager configuration to kubespray"

author Eric Multanen <eric.w.multanen@intel.com>

Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)
author Eric Multanen <eric.w.multanen@intel.com>
Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)
diff --cc kud/hosting_providers/containerized/installer.sh
Simple merge
diff --cc kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
Simple merge
diff --cc kud/hosting_providers/vagrant/installer.sh
Simple merge
diff --cc kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
Simple merge
diff --cc kud/tests/topology-manager.sh
Simple merge
author	Eric Multanen <eric.w.multanen@intel.com>
	Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 24 Jun 2021 20:50:20 +0000 (20:50 +0000)
		1	2
kud/hosting_providers/containerized/installer.sh	patch \|	diff1 \|	diff2 \|	blob \| history
kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml	patch \|	diff1 \|	diff2 \|	blob \| history
kud/hosting_providers/vagrant/installer.sh	patch \|	diff1 \|	diff2 \|	blob \| history
kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml	patch \|	diff1 \|	diff2 \|	blob \| history
kud/tests/topology-manager.sh	patch \|	diff1 \|	diff2 \|	blob \| history