From 4c0566331943dbc481f868e5596d0e68934c1309 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 11 Dec 2017 19:30:17 +0400
Subject: [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>
---
 .../classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml   | 5 +++++
 .../cluster/baremetal-mcp-pike-common-ha/openstack_control.yml   | 9 +++++++++
 mcp/reclass/classes/system                                       | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'mcp/reclass')

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
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 0a17807f3..74f5df259 160000
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e
+Subproject commit 74f5df259264c330637120ace4652c3a25aae255
-- 
cgit 1.2.3-korg