Move nova compute pillar to cluster level.
With the old setup there was no possibility to not
to install contrail-nova-driver because of pillar:
nova:
compute:
networking: contrail
So contrail-nova-driver was installed also with k8s
setup which is not desired.
This logic was moved to cluster level.
PROD-23348
Change-Id: I83acaa6ef0645adde4e7c1b06d6f5201169dbb84
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 5e92709..7cdcdf6 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -33,6 +33,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 8c16c70..425f897 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -48,6 +48,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index d3caa45..65426c8 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -30,7 +30,6 @@
mtu: 9000
nova:
compute:
- networking: contrail
network:
engine: keystone
host: ${_param:control_address}
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
index bd77c05..b48d1d0 100644
--- a/opencontrail/compute/single4_0.yml
+++ b/opencontrail/compute/single4_0.yml
@@ -38,7 +38,4 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail