aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-11 19:30:17 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-11 19:54:10 +0400
commit4c0566331943dbc481f868e5596d0e68934c1309 (patch)
tree3d1e1743b2acb454a6e5e63ad17bd10ba08f2dba /mcp/reclass/classes/cluster
parent9b94e9cdbaa76c39aabd7d6aa5befdce92a66a67 (diff)
[baremetal] Fixup pike deployment
* up glusterfs.client state before actual volume usage * handle keystone server state * specify suitable nova packages list for uca repo (consoleproxy vs novncproxy) * upgrade vcp nodes to get proper cryptography library for keystone * align service names for libvirt & glusterfs Change-Id: Iaeb7d147e6d407bbeaec2d40fd81037c939c3fe0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml5
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml9
2 files changed, 14 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
index df94e284f..a47ef2aa7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
@@ -39,6 +39,10 @@ parameters:
network:
remove_iface_files:
- '/etc/network/interfaces.d/50-cloud-init.cfg'
+ libvirt:
+ server:
+ service: libvirtd
+ config_sys: /etc/default/libvirtd
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
@@ -136,6 +140,7 @@ parameters:
model: virtio
glusterfs:
server:
+ service: glusterd
volumes:
nova_instances:
storage: /srv/glusterfs/nova_instances
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
index 12fc7b07e..9f8b7f40e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
@@ -46,6 +46,15 @@ parameters:
interface:
dhcp: ${_param:linux_dhcp_interface}
single: ${_param:linux_single_interface}
+ nova:
+ controller:
+ pkgs:
+ - nova-api
+ - nova-conductor
+ - nova-consoleauth
+ - nova-novncproxy
+ - nova-scheduler
+ - python-novaclient
neutron:
server:
vlan_aware_vms: true