Merge "Bootstrap default cells_v2 setup"

deployment/puppet/openstack_tasks/examples/openstack-controller/tasks.yaml

@@ -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

deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp

@@ -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':