| commit | 9b6bf04cc54b70872447543ed1195e20c8b87382 | [log] [tgz] |
|---|---|---|
| author | Richard Felkl <rfelkl@mirantis.com> | Wed Jun 27 11:43:57 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@853267bf53e2> | Wed Jun 27 11:43:57 2018 +0000 |
| tree | 250b64d8a2831f6bfe5df6817878cd05e16f2d9f | |
| parent | f54aa3436098ea690d7ade67435c201e7922f31c [diff] | |
| parent | 7294cfd86ba672299e8dd1337697e6b957966167 [diff] |
Merge "Change K8s version for OC4.0 + fix keepalived"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml index 52c6ade..ea2affc 100644 --- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml +++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -12,6 +12,7 @@ - system.ceilometer.agent.cluster - system.ceilometer.agent.polling.default - system.linux.network.interface.single_ovs_dvr +- system.nova.compute.libvirt.ssl - cluster.virtual-mcp-pike-dvr-ssl-barbican parameters: _param:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml index bb4d099..a461cf8 100644 --- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml +++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -12,6 +12,7 @@ - system.ceilometer.agent.cluster - system.ceilometer.agent.polling.default - system.linux.network.interface.single_ovs_dvr +- system.nova.compute.libvirt.ssl - cluster.virtual-mcp-pike-dvr-ssl parameters: _param:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml index 5a5710a..e908e62 100644 --- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml +++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -16,6 +16,7 @@ - system.nova.compute.nfv.sriov - system.neutron.compute.nfv.dpdk - system.neutron.compute.nfv.sriov +- system.nova.compute.libvirt.ssl - cluster.virtual-offline-ssl parameters: _param: