diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-06 16:39:35 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-08 14:21:23 +0100 |
| commit | 5527711008fdd6cb2558f18d901c40efbc5d522b (patch) | |
| tree | 5a292a9ec3d6f3a68b6451e0921ce2fdd0757a96 /mcp/reclass/classes | |
| parent | d2573b60c9daf2c3b6434112d98b733388824b4f (diff) | |
ha, noha: Fix Horizon stale cache after install
Partially revert more from commit 63b712d, it turns out static files
were not always up to date after the package install, so force a
refresh.
While at it, fold some common libvirt pillar configuration.
Fixes: af1a4adf
Change-Id: I1b4c20cfa9ae08d1cd7b0b774b544b76fc73a715
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes')
6 files changed, 2 insertions, 22 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index 70a2ba0c9..411fcee5a 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -84,6 +84,8 @@ parameters: report_interval: 120 nova: compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd disk_cachemodes: file=directsync,block=none preallocate_images: space heal_instance_info_cache_interval: 300 diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml index 4b718abe7..ffc3b5309 100644 --- a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml @@ -10,8 +10,3 @@ classes: - cluster.mcp-common-ha.openstack_compute - cluster.mcp-fdio-ha.openstack.compute_pdf - cluster.mcp-fdio-ha.infra -parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml index 0846be60d..3a49a69be 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml @@ -12,10 +12,6 @@ classes: - cluster.mcp-odl-ha.openstack.compute_pdf - cluster.mcp-odl-ha.infra parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd neutron: gateway: agent_mode: ${_param:neutron_gateway_agent_mode} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml index 658f8fafa..9af431b9a 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml @@ -12,10 +12,6 @@ classes: - cluster.mcp-ovn-ha.openstack.compute_pdf - cluster.mcp-ovn-ha.infra parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd neutron: gateway: ~message_queue: ~ diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml index 106a2a7ac..52e63dfd6 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml @@ -18,10 +18,6 @@ parameters: vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir} backend: tenant_vlan_range: ${_param:neutron_tenant_vlan_range} - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd linux: system: kernel: diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml index 1e157cfa7..2507f2bae 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml @@ -10,8 +10,3 @@ classes: - cluster.mcp-common-ha.openstack_compute - cluster.mcp-ovs-ha.openstack.compute_pdf - cluster.mcp-ovs-ha.infra -parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd |