openstack
/
fuel-library
Code Issues Proposed changes

Move openstack specific tasks to their own folder structure 

In order to better support loose coupling of openstack version to fuel
we need to separate the tasks that call into the specific version of the
puppet-openstack modules so that they can more easily be versioned from
their fuel version.

Initially we are separating them, later they will become their own
repository.

Change-Id: I8ea6c0387b73f8094d306a73dd779967d6d91871
Blueprint: fuel-openstack-tasks
This commit is contained in:
Andrew Woodward 2016-02-24 13:31:18 -08:00
parent dc1a32c76a
commit 96da5b4a1e
234 changed files with 592 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
deployment/Puppetfile
View File

@ -101,61 +101,6 @@ mod 'rsyslog',
:git => 'https://github.com/fuel-infra/puppet-rsyslog.git',
:ref => 'v3.5.1'
# Pull in puppet-openstacklib
mod 'openstacklib',
:git => 'https://github.com/fuel-infra/puppet-openstacklib.git',
:ref => 'master'
# Pull in puppet-keystone
mod 'keystone',
:git => 'https://github.com/fuel-infra/puppet-keystone.git',
:ref => 'master'
# Pull in puppet-neutron
mod 'neutron',
:git => 'https://github.com/fuel-infra/puppet-neutron.git',
:ref => 'master'
# Pull in puppet-nova
mod 'nova',
:git => 'https://github.com/fuel-infra/puppet-nova.git',
:ref => 'master'
# Pull in puppet-heat
mod 'heat',
:git => 'https://github.com/fuel-infra/puppet-heat.git',
:ref => 'master'
# Pull in puppet-horizon
mod 'horizon',
:git => 'https://github.com/fuel-infra/puppet-horizon.git',
:ref => 'master'
# Pull in puppet-glance
mod 'glance',
:git => 'https://github.com/fuel-infra/puppet-glance.git',
:ref => 'master'
# Pull in puppet-swift
mod 'swift',
:git => 'https://github.com/fuel-infra/puppet-swift.git',
:ref => 'master'
# Pull in puppet-ceilometer
mod 'ceilometer',
:git => 'https://github.com/fuel-infra/puppet-ceilometer.git',
:ref => 'master'
# Pull in openstack-cinder
mod 'cinder',
:git => 'https://github.com/fuel-infra/openstack-cinder.git',
:ref => 'master'
# Pull in puppet-sahara
mod 'sahara',
:git => 'https://github.com/fuel-infra/puppet-sahara.git',
:ref => 'master'
# Pull in puppet-openssl
mod 'openssl',
:git => 'https://github.com/fuel-infra/puppet-openssl.git',
@ -186,16 +131,6 @@ mod 'tftp',
:git => 'https://github.com/fuel-infra/puppetlabs-tftp.git',
:ref => '0.2.3'
# Pull in puppet-ironic
mod 'ironic',
:git => 'https://github.com/fuel-infra/puppet-ironic.git',
:ref => 'master'
# Pull in puppet-murano
mod 'murano',
:git => 'https://github.com/fuel-infra/puppet-murano.git',
:ref => 'master'
# Pull in richardc-datacat
mod 'datacat',
:git => 'https://github.com/fuel-infra/richardc-datacat.git',
@ -229,8 +164,3 @@ mod 'mysql',
mod 'galera',
:git => 'https://github.com/fuel-infra/puppet-galera.git',
:ref => '0.0.3-rc1'
# Pull in puppet-aodh
mod 'aodh',
:git => 'https://github.com/fuel-infra/puppet-aodh.git',
:ref => 'master'

92
deployment/puppet/openstack_tasks/Puppetfile Normal file
View File

@ -0,0 +1,92 @@
#!/usr/bin/env ruby
#^syntax detection
# See https://github.com/bodepd/librarian-puppet-simple for additional docs
#
# Important information for fuel-library:
# With librarian-puppet-simple you *must* remove the existing folder from the
# repo prior to trying to run librarian-puppet as it will not remove the folder
# for you and you may run into some errors.
#
############
# Examples #
############
# From git repo
# mod 'stdlib',
# :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
# :ref => '4.6.x'
#
# From tarbal
# mod 'stdlib',
# :tarbal => 'https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.6.0.tar.gz'
#
#
# Pull in puppet-aodh
mod 'aodh',
:git => 'https://github.com/fuel-infra/puppet-aodh.git',
:ref => 'master'
# Pull in puppet-ceilometer
mod 'ceilometer',
:git => 'https://github.com/fuel-infra/puppet-ceilometer.git',
:ref => 'master'
# Pull in openstack-cinder
mod 'cinder',
:git => 'https://github.com/fuel-infra/openstack-cinder.git',
:ref => 'master'
# Pull in puppet-glance
mod 'glance',
:git => 'https://github.com/fuel-infra/puppet-glance.git',
:ref => 'master'
# Pull in puppet-heat
mod 'heat',
:git => 'https://github.com/fuel-infra/puppet-heat.git',
:ref => 'master'
# Pull in puppet-horizon
mod 'horizon',
:git => 'https://github.com/fuel-infra/puppet-horizon.git',
:ref => 'master'
# Pull in puppet-ironic
mod 'ironic',
:git => 'https://github.com/fuel-infra/puppet-ironic.git',
:ref => 'master'
# Pull in puppet-keystone
mod 'keystone',
:git => 'https://github.com/fuel-infra/puppet-keystone.git',
:ref => 'master'
# Pull in puppet-openstacklib
mod 'openstacklib',
:git => 'https://github.com/fuel-infra/puppet-openstacklib.git',
:ref => 'master'
# Pull in puppet-neutron
mod 'neutron',
:git => 'https://github.com/fuel-infra/puppet-neutron.git',
:ref => 'master'
# Pull in puppet-nova
mod 'nova',
:git => 'https://github.com/fuel-infra/puppet-nova.git',
:ref => 'master'
# Pull in puppet-murano
mod 'murano',
:git => 'https://github.com/fuel-infra/puppet-murano.git',
:ref => 'master'
# Pull in puppet-sahara
mod 'sahara',
:git => 'https://github.com/fuel-infra/puppet-sahara.git',
:ref => 'master'
# Pull in puppet-swift
mod 'swift',
:git => 'https://github.com/fuel-infra/puppet-swift.git',
:ref => 'master'

1
deployment/puppet/openstack_tasks/examples/aodh/aodh.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::aodh::aodh

0
deployment/puppet/osnailyfacter/modular/aodh/aodh_post.rb → deployment/puppet/openstack_tasks/examples/aodh/aodh_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/aodh/aodh_pre.rb → deployment/puppet/openstack_tasks/examples/aodh/aodh_pre.rb
View File

6
deployment/puppet/openstack_tasks/examples/aodh/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::aodh::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/aodh/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::aodh::keystone

10
deployment/puppet/osnailyfacter/modular/aodh/tasks.yaml → deployment/puppet/openstack_tasks/examples/aodh/tasks.yaml
View File

@ -9,13 +9,13 @@
- name: aodh-keystone
condition: "settings:additional_components.ceilometer.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/aodh.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/aodh/aodh.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/aodh/aodh_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/aodh/aodh_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/aodh/aodh_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/aodh/aodh_post.rb
- id: aodh-keystone
type: puppet
@ -27,7 +27,7 @@
- name: keystone
condition: "settings:additional_components.ceilometer.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/aodh/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -41,6 +41,6 @@
condition: "settings:additional_components.ceilometer.value == true"
requires: [primary-database, database]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/aodh/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/ceilometer/compute.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ceilometer::compute

0
deployment/puppet/osnailyfacter/modular/ceilometer/compute_post.rb → deployment/puppet/openstack_tasks/examples/ceilometer/compute_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/ceilometer/compute_pre.rb → deployment/puppet/openstack_tasks/examples/ceilometer/compute_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/ceilometer/controller.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ceilometer::controller

0
deployment/puppet/osnailyfacter/modular/ceilometer/controller_post.rb → deployment/puppet/openstack_tasks/examples/ceilometer/controller_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/ceilometer/controller_pre.rb → deployment/puppet/openstack_tasks/examples/ceilometer/controller_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/ceilometer/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ceilometer::keystone

1
deployment/puppet/openstack_tasks/examples/ceilometer/radosgw_user.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ceilometer::radosgw_user

16
deployment/puppet/osnailyfacter/modular/ceilometer/tasks.yaml → deployment/puppet/openstack_tasks/examples/ceilometer/tasks.yaml
View File

@ -9,13 +9,13 @@
requires: [openstack-haproxy]
condition: "settings:additional_components.ceilometer.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ceilometer/controller.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/ceilometer/controller_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/ceilometer/controller_post.rb
- id: ceilometer-compute
type: puppet
@ -27,13 +27,13 @@
- name: ceilometer-controller
condition: "settings:additional_components.ceilometer.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/compute.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ceilometer/compute.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceilometer/compute_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/ceilometer/compute_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceilometer/compute_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/ceilometer/compute_post.rb
- id: ceilometer-keystone
type: puppet
@ -45,7 +45,7 @@
cross-depends:
- name: /(primary-)?keystone/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ceilometer/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -57,7 +57,7 @@
required_for: [post_deployment_end]
condition: "settings:additional_components.ceilometer.value == true and settings:storage.objects_ceph.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/radosgw_user.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ceilometer/radosgw_user.pp
puppet_modules: /etc/puppet/modules
timeout: 300
cwd: /

6
deployment/puppet/openstack_tasks/examples/glance/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::glance::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/glance/glance.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::glance::glance

0
deployment/puppet/osnailyfacter/modular/glance/glance_post.rb → deployment/puppet/openstack_tasks/examples/glance/glance_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/glance/glance_pre.rb → deployment/puppet/openstack_tasks/examples/glance/glance_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/glance/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::glance::keystone

10
deployment/puppet/osnailyfacter/modular/glance/tasks.yaml → deployment/puppet/openstack_tasks/examples/glance/tasks.yaml
View File

@ -8,13 +8,13 @@
- name: glance-db
- name: glance-keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/glance/glance.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/glance.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/glance/glance_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/glance/glance_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/glance/glance_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/glance/glance_post.rb
- id: glance-db
type: puppet
@ -25,7 +25,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/glance/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -38,6 +38,6 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/glance/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

6
deployment/puppet/openstack_tasks/examples/heat/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::heat::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

6
deployment/puppet/openstack_tasks/examples/heat/heat.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::heat::heat
class mysql::server {}
class mysql::config {}
include mysql::server
include mysql::config

0
deployment/puppet/osnailyfacter/modular/heat/heat_post.rb → deployment/puppet/openstack_tasks/examples/heat/heat_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/heat/heat_pre.rb → deployment/puppet/openstack_tasks/examples/heat/heat_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/heat/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::heat::keystone

16
deployment/puppet/osnailyfacter/modular/heat/tasks.yaml → deployment/puppet/openstack_tasks/examples/heat/tasks.yaml
View File

@ -9,13 +9,13 @@
- name: heat-keystone
- name: memcached
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/heat/heat.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/heat/heat.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/heat/heat_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/heat/heat_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/heat/heat_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/heat/heat_post.rb
- id: heat
type: puppet
@ -26,13 +26,13 @@
cross-depends:
- name: primary-heat
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/heat/heat.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/heat/heat.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/heat/heat_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/heat/heat_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/heat/heat_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/heat/heat_post.rb
- id: heat-db
type: puppet
@ -43,7 +43,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/heat/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/heat/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -56,6 +56,6 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/heat/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/heat/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/horizon/horizon.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::horizon::horizon

0
deployment/puppet/osnailyfacter/modular/horizon/horizon_post.rb → deployment/puppet/openstack_tasks/examples/horizon/horizon_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/horizon/horizon_pre.rb → deployment/puppet/openstack_tasks/examples/horizon/horizon_pre.rb
View File

6
deployment/puppet/osnailyfacter/modular/horizon/tasks.yaml → deployment/puppet/openstack_tasks/examples/horizon/tasks.yaml
View File

@ -7,10 +7,10 @@
cross-depends:
- name: memcached
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/horizon/horizon.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/horizon/horizon_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/horizon/horizon_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/horizon/horizon_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/horizon/horizon_post.rb

6
deployment/puppet/openstack_tasks/examples/ironic/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::ironic::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/ironic/ironic-compute.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ironic::ironic_compute

1
deployment/puppet/openstack_tasks/examples/ironic/ironic.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ironic::ironic

1
deployment/puppet/openstack_tasks/examples/ironic/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::ironic::keystone

8
deployment/puppet/osnailyfacter/modular/ironic/tasks.yaml → deployment/puppet/openstack_tasks/examples/ironic/tasks.yaml
View File

@ -9,7 +9,7 @@
required_for: [primary-openstack-controller, openstack-controller]
requires: [openstack-haproxy, ironic-db, ironic-keystone]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ironic/ironic.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ironic/ironic.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -23,7 +23,7 @@
required_for: [ironic-api]
requires: [primary-database, database]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ironic/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ironic/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -37,7 +37,7 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ironic/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ironic/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -55,6 +55,6 @@
- name: ironic-api
- name: memcached
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ironic/ironic-compute.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/ironic/ironic-compute.pp
puppet_modules: /etc/puppet/modules
timeout: 3600

0
deployment/puppet/osnailyfacter/modular/ironic/upload_images.rb → deployment/puppet/openstack_tasks/examples/ironic/upload_images.rb
View File

6
deployment/puppet/openstack_tasks/examples/keystone/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::keystone::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/keystone/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::keystone::keystone

0
deployment/puppet/osnailyfacter/modular/keystone/keystone_post.rb → deployment/puppet/openstack_tasks/examples/keystone/keystone_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/keystone/keystone_pre.rb → deployment/puppet/openstack_tasks/examples/keystone/keystone_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/keystone/openrc_delete.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::keystone::openrc_delete

18
deployment/puppet/osnailyfacter/modular/keystone/tasks.yaml → deployment/puppet/openstack_tasks/examples/keystone/tasks.yaml
View File

@ -6,7 +6,7 @@
required_for: [primary-keystone, keystone]
refresh_on: [keystone_config]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/openrc_delete.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/openrc_delete.pp
puppet_modules: /etc/puppet/modules
timeout: 90
@ -22,13 +22,13 @@
- name: keystone-db
- name: memcached
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/keystone/keystone_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/keystone/keystone_post.rb
- id: keystone
type: puppet
@ -42,13 +42,13 @@
- name: keystone-db
- name: primary-keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/keystone/keystone_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/keystone/keystone_post.rb
- id: keystone-db
type: puppet
@ -59,7 +59,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -70,6 +70,6 @@
required_for: [deploy_end]
requires: [keystone, primary-keystone]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/workloads_collector_add.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/workloads_collector_add.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/keystone/workloads_collector_add.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::keystone::workloads_collector_add

1
deployment/puppet/openstack_tasks/examples/keystone/workloads_collector_remove.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::keystone::workloads_collector_remove

4
deployment/puppet/openstack_tasks/examples/murano/cfapi.pp Normal file
View File

@ -0,0 +1,4 @@
include ::openstack_tasks::murano::cfapi
class openstack::firewall {}
include openstack::firewall

8
deployment/puppet/openstack_tasks/examples/murano/db.pp Normal file
View File

@ -0,0 +1,8 @@
include ::openstack_tasks::murano::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server
class murano::api {}
include murano::api

1
deployment/puppet/openstack_tasks/examples/murano/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::murano::keystone

1
deployment/puppet/openstack_tasks/examples/murano/keystone_cfapi.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::murano::keystone_cfapi

4
deployment/puppet/openstack_tasks/examples/murano/murano.pp Normal file
View File

@ -0,0 +1,4 @@
include ::openstack_tasks::murano::murano
class openstack::firewall {}
include openstack::firewall

0
deployment/puppet/osnailyfacter/modular/murano/murano_post.rb → deployment/puppet/openstack_tasks/examples/murano/murano_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/murano/murano_pre.rb → deployment/puppet/openstack_tasks/examples/murano/murano_pre.rb
View File

1
deployment/puppet/openstack_tasks/examples/murano/rabbitmq.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::murano::rabbitmq

16
deployment/puppet/osnailyfacter/modular/murano/tasks.yaml → deployment/puppet/openstack_tasks/examples/murano/tasks.yaml
View File

@ -9,13 +9,13 @@
- name: murano-db
- name: murano-keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/murano.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/murano.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/murano/murano_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/murano/murano_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/murano/murano_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/murano/murano_post.rb
- id: murano-db
type: puppet
@ -27,7 +27,7 @@
required_for: [murano]
requires: [primary-database, database]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -41,7 +41,7 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -56,7 +56,7 @@
role: self
requires: [rabbitmq, primary-rabbitmq]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/rabbitmq.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/rabbitmq.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -67,7 +67,7 @@
condition: "settings:additional_components.murano-cfapi.value == true"
requires: [murano]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/cfapi.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/cfapi.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -81,7 +81,7 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/murano/keystone_cfapi.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/murano/keystone_cfapi.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/openstack-cinder/create_cinder_types.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_cinder::create_cinder_types

6
deployment/puppet/openstack_tasks/examples/openstack-cinder/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::openstack_cinder::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/openstack-cinder/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_cinder::keystone

1
deployment/puppet/openstack_tasks/examples/openstack-cinder/openstack-cinder.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_cinder::openstack_cinder

8
deployment/puppet/osnailyfacter/modular/openstack-cinder/tasks.yaml → deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml
View File

@ -8,7 +8,7 @@
- name: cinder-db
- name: cinder-keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/openstack-cinder.pp
puppet_modules: /etc/puppet/modules
timeout: 1200
@ -21,7 +21,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-cinder/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -34,7 +34,7 @@
- name: keystone
requires: [primary-keystone, keystone]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-cinder/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/keystone.pp
puppet_modules: /etc/puppet/modules/
timeout: 1800
@ -45,6 +45,6 @@
requires: [openstack-cinder]
required_for: [deploy_end]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-cinder/create_cinder_types.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/create_cinder_types.pp
puppet_modules: /etc/puppet/modules
timeout: 1200

6
deployment/puppet/openstack_tasks/examples/openstack-controller/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::openstack_controller::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/openstack-controller/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_controller::keystone

1
deployment/puppet/openstack_tasks/examples/openstack-controller/openstack-controller.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_controller::openstack_controller

8
deployment/puppet/osnailyfacter/modular/openstack-controller/tasks.yaml → deployment/puppet/openstack_tasks/examples/openstack-controller/tasks.yaml
View File

@ -11,7 +11,7 @@
- name: memcached
refresh_on: [nova_config, nova_paste_api_ini]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/openstack-controller.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -25,7 +25,7 @@
- name: primary-openstack-controller
refresh_on: [nova_config, nova_paste_api_ini]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/openstack-controller.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -38,7 +38,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-controller/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -51,6 +51,6 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-controller/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

4
deployment/puppet/openstack_tasks/examples/openstack-network/agents/dhcp.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron {}
class { 'neutron' :}
include ::openstack_tasks::openstack_network::agents::dhcp

4
deployment/puppet/openstack_tasks/examples/openstack-network/agents/l3.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron {}
class { 'neutron' :}
include ::openstack_tasks::openstack_network::agents::l3

4
deployment/puppet/openstack_tasks/examples/openstack-network/agents/metadata.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron {}
class { 'neutron' :}
include ::openstack_tasks::openstack_network::agents::metadata

4
deployment/puppet/openstack_tasks/examples/openstack-network/agents/sriov.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron {}
class { 'neutron' :}
include ::openstack_tasks::openstack_network::agents::sriov

1
deployment/puppet/openstack_tasks/examples/openstack-network/common-config.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::common_config

1
deployment/puppet/openstack_tasks/examples/openstack-network/compute-nova.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::compute_nova

6
deployment/puppet/openstack_tasks/examples/openstack-network/db.pp Normal file
View File

@ -0,0 +1,6 @@
include ::openstack_tasks::openstack_network::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server

1
deployment/puppet/openstack_tasks/examples/openstack-network/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::keystone

1
deployment/puppet/openstack_tasks/examples/openstack-network/networks.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::networks

4
deployment/puppet/openstack_tasks/examples/openstack-network/plugins/ml2.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron {}
class { 'neutron' :}
include ::openstack_tasks::openstack_network::plugins::ml2

1
deployment/puppet/openstack_tasks/examples/openstack-network/routers.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::routers

0
deployment/puppet/osnailyfacter/modular/openstack-network/run_neutron_granular_noops.sh → deployment/puppet/openstack_tasks/examples/openstack-network/run_neutron_granular_noops.sh
View File

4
deployment/puppet/openstack_tasks/examples/openstack-network/server-config.pp Normal file
View File

@ -0,0 +1,4 @@
class neutron { }
class { 'neutron' : }
include ::openstack_tasks::openstack_network::server_config

1
deployment/puppet/openstack_tasks/examples/openstack-network/server-nova.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::openstack_network::server_nova

36
deployment/puppet/osnailyfacter/modular/openstack-network/tasks.yaml → deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml
View File

@ -7,7 +7,7 @@
cross-depends:
- name: /(primary-)?database/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -20,7 +20,7 @@
cross-depends:
- name: keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -43,7 +43,7 @@
required_for: [openstack-network-end]
requires: [openstack-network-start]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/common-config.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/common-config.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -56,7 +56,7 @@
refresh_on: [neutron_plugin_ml2, neutron_config, neutron_api_config]
reexecute_on: [deploy_changes]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/server-config.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/server-config.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -68,7 +68,7 @@
requires: [openstack-network-common-config, openstack-network-server-config]
refresh_on: [neutron_agent_ovs]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/plugins/ml2.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/plugins/ml2.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -83,7 +83,7 @@
cross-depends:
- name: primary-openstack-network-plugins-l2
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/plugins/ml2.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/plugins/ml2.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -94,7 +94,7 @@
required_for: [openstack-network-end]
requires: [primary-openstack-network-plugins-l2]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/networks.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/networks.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -106,7 +106,7 @@
required_for: [openstack-network-end]
requires: [openstack-network-networks]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/routers.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/routers.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -120,7 +120,7 @@
required_for: [post_deployment_end]
requires: [post_deployment_start]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/routers.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/routers.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
cwd: /
@ -133,7 +133,7 @@
requires: [openstack-network-networks, openstack-network-routers, primary-openstack-network-plugins-l2, openstack-network-plugins-l2]
refresh_on: [neutron_l3_agent_config]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/l3.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/l3.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -149,7 +149,7 @@
- name: /(primary-)?openstack-network-plugins-l2/
- name: primary-openstack-network-agents-l3
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/l3.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/l3.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -161,7 +161,7 @@
requires: [openstack-network-plugins-l2]
refresh_on: [neutron_sriov_agent_config]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/sriov.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/sriov.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -175,7 +175,7 @@
- name: /(primary-)?openstack-network-agents-l3/
- name: /(primary-)?openstack-network-plugins-l2/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/server-nova.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/server-nova.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -189,7 +189,7 @@
cross-depends:
- name: /(primary-)?openstack-network-plugins-l2/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/dhcp.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/dhcp.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -205,7 +205,7 @@
- name: primary-openstack-network-agents-dhcp
- name: /(primary-)?openstack-network-plugins-l2/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/dhcp.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/dhcp.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -220,7 +220,7 @@
- name: /(primary-)?openstack-network-plugins-l2/
- name: /(primary-)?openstack-network-agents-l3/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/metadata.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/metadata.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -236,7 +236,7 @@
- name: primary-openstack-network-agents-metadata
- name: /(primary-)?openstack-network-plugins-l2/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/metadata.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/agents/metadata.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -249,7 +249,7 @@
cross-depends:
- name: /(primary-)?openstack-network-plugins-l2/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/compute-nova.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/compute-nova.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/roles/allocate_hugepages.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::allocate_hugepages

1
deployment/puppet/openstack_tasks/examples/roles/cinder.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::cinder

1
deployment/puppet/openstack_tasks/examples/roles/compute.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::compute

1
deployment/puppet/openstack_tasks/examples/roles/controller.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::controller

1
deployment/puppet/openstack_tasks/examples/roles/enable_cinder.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::enable_cinder

1
deployment/puppet/openstack_tasks/examples/roles/enable_compute.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::enable_compute

1
deployment/puppet/openstack_tasks/examples/roles/ironic-conductor.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::ironic_conductor

1
deployment/puppet/openstack_tasks/examples/roles/mongo.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::roles::mongo

18
deployment/puppet/osnailyfacter/modular/roles/tasks.yaml → deployment/puppet/openstack_tasks/examples/roles/tasks.yaml
View File

@ -4,7 +4,7 @@
groups: [primary-controller, controller]
required_for: [deploy_end]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/controller.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/controller.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -21,7 +21,7 @@
- name: memcached
refresh_on: [nova_config, nova_paste_api_ini]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/compute.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/compute.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -34,7 +34,7 @@
cross-depends:
- name: openstack-cinder
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/cinder.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/cinder.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -45,7 +45,7 @@
requires: [top-role-cinder]
required_for: [deploy_end]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/enable_cinder.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/enable_cinder.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
cwd: /
@ -57,7 +57,7 @@
required_for: [deploy_end]
requires: [hosts, firewall]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/mongo.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/mongo.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -70,7 +70,7 @@
required_for: [deploy_end]
requires: [hosts, firewall]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/mongo.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/mongo.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -85,7 +85,7 @@
- name: /(primary-)?database/
- name: /(primary-)?rabbitmq/
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/ironic-conductor.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/ironic-conductor.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
@ -97,7 +97,7 @@
required_for: [deploy_end]
refresh_on: [nova_config, nova_paste_api_ini]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/enable_compute.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/enable_compute.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
cwd: /
@ -109,7 +109,7 @@
requires: [setup_repositories]
required_for: [globals]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/allocate_hugepages.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/roles/allocate_hugepages.pp
puppet_modules: /etc/puppet/modules
timeout: 300
cwd: /

8
deployment/puppet/openstack_tasks/examples/sahara/db.pp Normal file
View File

@ -0,0 +1,8 @@
include ::openstack_tasks::sahara::db
class mysql::config {}
include mysql::config
class mysql::server {}
include mysql::server
class sahara::api {}
include sahara::api

1
deployment/puppet/openstack_tasks/examples/sahara/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::sahara::keystone

4
deployment/puppet/openstack_tasks/examples/sahara/sahara.pp Normal file
View File

@ -0,0 +1,4 @@
include ::openstack_tasks::sahara::sahara
class openstack::firewall {}
include openstack::firewall

0
deployment/puppet/osnailyfacter/modular/sahara/sahara_post.rb → deployment/puppet/openstack_tasks/examples/sahara/sahara_post.rb
View File

0
deployment/puppet/osnailyfacter/modular/sahara/sahara_pre.rb → deployment/puppet/openstack_tasks/examples/sahara/sahara_pre.rb
View File

10
deployment/puppet/osnailyfacter/modular/sahara/tasks.yaml → deployment/puppet/openstack_tasks/examples/sahara/tasks.yaml
View File

@ -9,13 +9,13 @@
- name: sahara-db
- name: sahara-keystone
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/sahara/sahara.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
test_pre:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_pre.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/sahara/sahara_pre.rb
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/sahara/sahara_post.rb
cmd: ruby /etc/puppet/modules/openstack_tasks/examples/sahara/sahara_post.rb
- id: sahara-db
type: puppet
@ -27,7 +27,7 @@
condition: "settings:additional_components.sahara.value == true"
requires: [primary-database, database]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/sahara/db.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/sahara/db.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
@ -41,6 +41,6 @@
- name: keystone
condition: "settings:additional_components.sahara.value == true"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/sahara/keystone.pp
puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/sahara/keystone.pp
puppet_modules: /etc/puppet/modules
timeout: 1800

1
deployment/puppet/openstack_tasks/examples/swift/keystone.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::swift::keystone

14
deployment/puppet/openstack_tasks/examples/swift/proxy.pp Normal file
View File

@ -0,0 +1,14 @@
include ::openstack_tasks::swift::proxy
# 'ceilometer' class is being declared inside openstack::ceilometer class
# which is declared inside openstack::controller class in the other task.
# So we need a stub here for dependency from swift::proxy::ceilometer
class ceilometer {}
include ceilometer
# Class[Swift::Proxy::Cache] requires Class[Memcached] if memcache_servers
# contains 127.0.0.1. But we're deploying memcached in another task. So we
# need to add this stub here.
class memcached {}
include memcached

1
deployment/puppet/openstack_tasks/examples/swift/rebalance_cronjob.pp Normal file
View File

@ -0,0 +1 @@
include ::openstack_tasks::swift::rebalance_cronjob

0
deployment/puppet/osnailyfacter/modular/swift/rebalance_cronjob_post.rb → deployment/puppet/openstack_tasks/examples/swift/rebalance_cronjob_post.rb
View File

15
deployment/puppet/openstack_tasks/examples/swift/storage.pp Normal file
View File

@ -0,0 +1,15 @@
include ::openstack_tasks::swift::storage
# 'ceilometer' class is being declared inside openstack::ceilometer class
# which is declared inside openstack::controller class in the other task.
# So we need a stub here for dependency from swift::proxy::ceilometer
class ceilometer {}
include ceilometer
# Class[Swift::Proxy::Cache] requires Class[Memcached] if memcache_servers
# contains 127.0.0.1. But we're deploying memcached in another task. So we
# need to add this stub here.
class memcached {}
include memcached
#

Some files were not shown because too many files have changed in this diff Show More