Bootstrap default cells_v2 setup

Cells v2 setup is mandatory for Ocata. We need to bootstrap them on the
controller nodes and run discover_hosts each deployment.

Change-Id: Id392febd0ffb527f9e8305d347805e9f4f776a7f
Closes-bug: #1670462
This commit is contained in:
Vladimir Kuklin 2017-03-06 21:45:37 +03:00
parent 1bbe3869f7
commit b3787ca38a
2 changed files with 23 additions and 0 deletions

View File

@ -87,3 +87,23 @@
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
- id: discover_compute_nodes
version: 2.2.0
type: shell
tags: [primary-controller]
requires: [post_deployment_start]
required_for: [post_deployment_end]
condition:
#Remove this condition when MOS Ocata packages are ready
yaql_exp: >
$.get('repo_setup', {}).get('repo_type', 'fuel') = 'uca'
cross-depends:
- name: post_deployment_start
role: self
cross-depended-by:
- name: post_deployment_end
role: self
parameters:
cmd: "nova-manage cell_v2 discover_hosts"
timeout: 300

View File

@ -275,6 +275,9 @@ class openstack_tasks::openstack_controller::openstack_controller {
project_name => pick($nova_hash['admin_tenant_name'], $keystone_tenant),
os_region_name => $region_name
}
if $primary_controller {
include ::nova::cell_v2::simple_setup
}
}
# Configure nova-api
class { '::nova::api':