Skip to content

Commit

Permalink
Adding necessary data mappings and class groups for ceilometer deploy…
Browse files Browse the repository at this point in the history
…ment
  • Loading branch information
Pradeep Kilambi committed Oct 21, 2013
1 parent 7034ad6 commit c4f26bf
Show file tree
Hide file tree
Showing 12 changed files with 56 additions and 2 deletions.
4 changes: 4 additions & 0 deletions data/class_groups/ceilometer_compute.yaml
@@ -0,0 +1,4 @@
classes:
- ceilometer
- ceilometer::agent::auth
- ceilometer::agent::compute
8 changes: 8 additions & 0 deletions data/class_groups/ceilometer_controller.yaml
@@ -0,0 +1,8 @@
classes:
- ceilometer
- mongodb
- ceilometer::keystone::auth
- ceilometer::db
- ceilometer::collector
- ceilometer::agent::central
- ceilometer::api
1 change: 1 addition & 0 deletions data/class_groups/compute.yaml
@@ -1,3 +1,4 @@
class_groups:
- nova_compute
- cinder_volume
- ceilometer_compute
1 change: 1 addition & 0 deletions data/class_groups/controller.yaml
Expand Up @@ -4,6 +4,7 @@ class_groups:
- cinder_controller
- nova_controller
- horizon
- ceilometer_controller
- "%{db_type}_database"
classes:
- "nova::%{rpc_type}"
Expand Down
2 changes: 2 additions & 0 deletions data/data_mappings/advanced.yaml
Expand Up @@ -16,6 +16,7 @@ package_ensure:
- nova::objectstore::ensure_package
- nova::scheduler::ensure_package
- nova::vncproxy::ensure_package
- ceilometer::package_ensure
region:
- cinder::keystone::auth::region
- glance:keystone::auth::region
Expand All @@ -27,3 +28,4 @@ region:
- nova::network::neutronclient::neutron_region_name
- quantum::agents::metadata::auth_region
- neutron::agents::metadata::auth_region
- ceilometer::keystone::auth::region
16 changes: 16 additions & 0 deletions data/data_mappings/common.yaml
Expand Up @@ -8,15 +8,18 @@ debug:
- neutron::debug
- quatum::agents::dhcp::debug
- quatum::agents::metadata::debug
- ceilometer::debug
verbose:
- cinder::verbose
- glance::api::verbose
- glance::registry::verbose
- keystone::verbose
- quantum::verbose
- neutron::verbose
- ceilometer::verbose
admin_email:
- keystone::roles::admin::email
- ceilometer::keystone::auth::email
# this needs to be supplied as a defualt
# b/c the default to guest is kind of annoying
# (and not entirely reasonable)
Expand All @@ -31,6 +34,8 @@ rpc_user:
- neutron::rabbit_user
- quantum::qpid_username
- neutron::qpid_username
- ceilometer::rabbit_userid
- ceilometer::qpid_username
enabled_services:
- coi::profiles::openstack::endpoints::enabled_services
- coi::profiles::openstack::databases::mysql::enabled_services
Expand Down Expand Up @@ -59,6 +64,8 @@ controller_internal_address:
- neutron::qpid_hostname
- neutron::rabbit_host
- ceilometer::db::mysql::host
- ceilometer::rabbit_host
- ceilometer::qpid_hostname
- cinder::db::mysql::host
- glance::db::mysql::host
- keystone::db::mysql::host
Expand Down Expand Up @@ -86,6 +93,8 @@ controller_internal_address:
- neutron::agents::metadata::metadata_ip
- openstack::swift::proxy::keystone_host
- swift::keystone::auth::internal_address
- ceilometer::keystone::auth::internal_address
- ceilometer::api::keystone_host
- coe::base::controller_node_internal
- coe::base::controller_hostname
controller_public_address:
Expand All @@ -98,6 +107,7 @@ controller_public_address:
- quantum::keystone::auth::public_address
- neutron::keystone::auth::public_address
- swift::keystone::auth::public_address
- ceilometer::keystone::auth::public_address
- openstack::swift::proxy::swift_proxy_net_ip
controller_admin_address:
- cinder::keystone::auth::admin_address
Expand All @@ -107,6 +117,7 @@ controller_admin_address:
- quantum::keystone::auth::admin_address
- neutron::keystone::auth::admin_address
- swift::keystone::auth::admin_address
- ceilometer::keystone::auth::admin_address
swift_local_net_ip:
- openstack::swift::proxy::swift_local_net_ip
- openstack::swift::storage-node::swift_local_net_ip
Expand All @@ -130,6 +141,9 @@ compute_internal_address:
- quantum::plugins::linuxbridge::sql_connection
- neutron::plugins::ovs::sql_connection
- neutron::plugins::linuxbridge::sql_connection
"mongodb://ceilometer:%{ceilometer_db_password}@%{controller_internal_address}/ceilometer":
- ceilometer::database_connection
- ceilometer::db::database_connection
"http://%{controller_internal_address}:9696":
- nova::network::quantum::quantum_url
- nova::network::neutron::neutron_url
Expand All @@ -138,6 +152,8 @@ compute_internal_address:
- nova::network::neutron::neutron_admin_auth_url
- quantum::agents::metadata::auth_url
- neutron::agents::metadata::auth_url
- ceilometer::agent::compute::auth_url
- ceilometer::agent::auth::auth_url
"%{controller_internal_address}:9292":
- nova::glance_api_servers
build_node_name:
Expand Down
6 changes: 6 additions & 0 deletions data/data_mappings/password_management/basic.yaml
Expand Up @@ -57,3 +57,9 @@ password:
- quantum::agents::metadata::auth_password
- neutron::agents::metadata::auth_password
- openstack::auth_file::admin_password
- ceilometer::keystone::auth::password
- ceilometer::api::keystone_password
- ceilometer::db::mysql::password
- ceilometer::agent::auth::auth_password
- ceilometer::qpid_password
- ceilometer::rabbit_password
9 changes: 9 additions & 0 deletions data/data_mappings/password_management/individual.yaml
Expand Up @@ -62,9 +62,18 @@ rpc_password:
- quantum::qpid_password
- neutron::rabbit_password
- neutron::qpid_password
- ceilometer::rabbit_password
- ceilometer::qpid_password
metadata_shared_secret:
- quantum::agents::metadata::shared_secret
- neutron::agents::metadata::shared_secret
- nova::api::quantum_metadata_proxy_shared_secret
horizon_secret_key:
- horizon::secret_key
ceilometer_db_password:
- ceilometer::db::mysql::password
ceilometer_metering_secret:
- ceilometer::metering_secret
ceilometer_service_password:
- ceilometer::keystone::auth::password
- ceilometer::api::admin_password
1 change: 1 addition & 0 deletions data/hiera_data/common.yaml
Expand Up @@ -9,6 +9,7 @@ enabled_services:
# should I be able to interpolate this?
- "%{network_service}"
- swift
- ceilometer

allowed_hosts: "%"

Expand Down
2 changes: 2 additions & 0 deletions data/hiera_data/rpc_type/qpid.yaml
Expand Up @@ -6,3 +6,5 @@ quantum::rpc_backend:
'neutron.openstack.common.rpc.impl_qpid'
neutron::rpc_backend:
'neutron.openstack.common.rpc.impl_qpid'
ceilometer:rpc_backend:
'ceilometer.openstack.common.rpc.impl_qpid'
2 changes: 2 additions & 0 deletions data/hiera_data/rpc_type/rabbitmq.yaml
Expand Up @@ -6,3 +6,5 @@ quantum::rpc_backend:
'quantum.openstack.common.rpc.impl_kombu'
neutron::rpc_backend:
'neutron.openstack.common.rpc.impl_kombu'
ceilometer:rpc_backend:
'ceilometer.openstack.common.rpc.impl_kombu'
6 changes: 4 additions & 2 deletions data/hiera_data/user.common.yaml
Expand Up @@ -31,13 +31,15 @@ database_root_password: mysql_pass
cinder_service_password: cinder_pass
glance_service_password: glance_pass
nova_service_password: nova_pass
ceilometer_service_password: ceilometer_pass
admin_password: Cisco123
admin_token: keystone_admin_token
network_service_password: quantum_pass
rpc_password: openstack_rabbit_password
metadata_shared_secret: metadata_shared_secret,
metadata_shared_secret: metadata_shared_secret
horizon_secret_key: horizon_secret_key

ceilometer_metering_secret: ceilometer_metering_secret
ceilometer_db_password: ceilometer
# for single password config
secret_key: secret
password: password123
Expand Down

0 comments on commit c4f26bf

Please sign in to comment.