diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-11 17:15:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 17:15:05 +0000 |
| commit | cce966ccdff1ef69898e1028bb8370923e3629d9 (patch) | |
| tree | 063f177012b06578bcfb8ae728f1ce871979e7d8 /mcp/reclass/classes | |
| parent | a184534e19e2afcfd08b4bade6e87dae4c454b71 (diff) | |
| parent | 4c0566331943dbc481f868e5596d0e68934c1309 (diff) | |
Merge "[baremetal] Fixup pike deployment"
Diffstat (limited to 'mcp/reclass/classes')
3 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 f0d91e304..fe9646535 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 @@ -37,6 +37,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 @@ -134,6 +138,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 083d0a8b7..f15fbed27 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 @@ -44,6 +44,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 -Subproject 0a17807f39aac95f9e0de8643f64e5116bdd1a1 +Subproject 74f5df259264c330637120ace4652c3a25aae25 |