Deprecate kickstack completely

This commit moves the last but of functionality
from kickstack to puppet-coi.

- removes kickstack from the Puppetfile
- adds the enabled_services that drive the config
of those classes to hiera/common and the common
data mappings.
- updates the keystone and mysql class groups to
use the new classes.
This commit is contained in:
Dan Bode
2013-09-19 15:04:04 -07:00
parent d20e35da93
commit 40fdce8e98
6 changed files with 16 additions and 4 deletions

View File

@@ -80,7 +80,6 @@ mod 'puppetlabs/puppetdb', :git => "#{base_url}/puppetlabs/puppetlabs-puppetdb",
mod 'puppetlabs/vcsrepo', :git => "#{base_url}/puppetlabs/puppetlabs-vcsrepo", :ref => 'master'
mod 'ripienaar/ruby-puppetdb', :git => "#{base_url}/ripienaar/ruby-puppetdb"
mod 'ripienaar/catalog-diff', :git => "#{base_url}/ripienaar/puppet-catalog-diff", :ref => 'master'
mod 'hastexo/kickstack', :git => "#{base_url}/bodepd/kickstack", :ref => 'origin/data_refactor'
# do I really need this firewall module?
mod 'puppetlabs/firewall', :git => "#{base_url}/puppetlabs/puppetlabs-firewall", :ref => 'master'
# stephenrjohnson

View File

@@ -4,4 +4,4 @@ classes:
# the endpoint additions and database additions
# are a little difficult for me
# I am not sure how it fits into the ideal model
- kickstack::keystone::endpoints
- coi::profiles::openstack::endpoints

View File

@@ -1,4 +1,4 @@
classes:
- mysql::server
- mysql::server::account_security
- kickstack::database::databases
- coi::profiles::openstack::databases::mysql

View File

@@ -28,7 +28,8 @@ enabled_services:
- cinder
- keystone
- nova
- network
# should I be able to interpolate this?
- quantum
- swift
operatingsystem: ubuntu

View File

@@ -31,3 +31,6 @@ rpc_user:
- neutron::rabbit_user
- quantum::qpid_username
- neutron::qpid_username
enabled_services:
- coi::profiles::openstack::endpoints::enabled_services
- coi::profiles::openstack::databases::mysql::enabled_services

View File

@@ -8,6 +8,15 @@ private_interface: eth1
external_interface: eth2
puppet::master::version: '3.2.3-1puppetlabs1'
enabled_services:
- glance
- cinder
- keystone
- nova
# should I be able to interpolate this?
- quantum
- swift
# openstack parameters
admin_email: root@localhost
rpc_user: openstack_rabbit_user