- id: sahara
  type: puppet
  groups: [primary-controller, controller]
  required_for: [deploy_end, controller_remaining_tasks]
  requires: [openstack-controller, horizon]
  parameters:
    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp
    puppet_modules: /etc/puppet/modules
    timeout: 3600
  test_pre:
    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_pre.rb
  test_post:
    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_post.rb


- id: sahara
  type: puppet
  groups: [primary-controller, controller]
  required_for: [deploy_end, controller_remaining_tasks]
  requires: [openstack-network, horizon]
  parameters:
    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp
    puppet_modules: /etc/puppet/modules
    timeout: 3600
  test_pre:
    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_pre.rb
  test_post:
    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_post.rb


Fix task require for modular Sahara
Fix task require for modular Sahara

The problem is that sahara class called early than openstack-network-controller.
But Sahara creates templates, which require Neutron. As a result, Neutron
doesn't installed and neutronclient gave 503 error response.

Change-Id: I951894b5610dbe339db6cf5dcb62da34535a65ef
Closes-bug: #1455085
