Skip to content
Snippets Groups Projects
Commit 47679fb9 authored by Alessandro Costantini's avatar Alessandro Costantini
Browse files

Unnecessary files cleaned for mergeing

parent 422f5262
No related branches found
No related tags found
1 merge request!9Development
CONTROLLER HA
base.pp -> VLAN, NTP, Network commented
heat.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts; commented haproxy configuration
horizon.pp -> commented haproxy configuration
keystone.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts; commented $admin_bind_host; commented haproxy configuration
database-client.pp -> Refactoring: mysql server + mysql client
*cinder.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts; commented haproxy configuration; cinder:backup+ceph commented
*glance.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts; commented haproxy configuration; CEPH configuration
Ceilometer
common.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts
controller.pp -> commented haproxy configuration; coomented zookeeper installation and configuration
Neutron
common.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts
server.pp -> commented haproxy configuration
Nova
common.pp -> Added RabbitMQHosts, $rhosts; added $rabbit_hosts
controller.pp -> commented haproxy configuration
*CEPH-related classes
database.pp -> $host, database parameter
controller.pp -> Classes modified to unplug database and rabbit; neutron router added
class iaas::role::endpoint (
) {
class { 'iaas::profile::base': }
class { 'iaas::profile::haproxy': }
class { 'iaas::profile::neutron::router': }
}
class iaas::role::storage (
##Variables to be uncommented if needed
# $cluster_vlan = undef,
# $cluster_ipaddress = undef,
# $cluster_netmask = undef,
# $osd_disk = undef,
# $osd_partition = undef,
# $osd_uuid = undef,
) {
# Base
class { 'iaas::profile::base': } ->
##Ceph cluster network - enable for VLAN
# network_config { "eth0.${cluster_vlan}":
# ensure => 'present',
# family => 'inet',
# method => 'static',
# ipaddress => $cluster_ipaddress,
# netmask => $cluster_netmask,
# onboot => 'true',
# } ->
# exec { "ifup_eth0.${cluster_vlan}":
# command => "ifup eth0.${cluster_vlan}",
# } ->
# Ceph
class { 'ceph::profile::base': } ->
class { 'ceph::profile::mon': } ->
class { 'ceph::keys': } ->
##Trick to use a partition for an OSD
# exec { "ceph-osd-sgdisk-${osd_partition}":
# command => "sgdisk --change-name='${osd_partition}:ceph data' --partition-guid=${osd_partition}:${osd_uuid} --typecode=${osd_partition}:4fbd7e29-9d25-41b8-afd0-062c0ceff05d -- ${osd_disk} && partprobe",
# unless => "/bin/true # comment to satisfy puppet syntax requirements
# set -ex
# ceph-disk list 2> /dev/null | grep ' *${osd_disk}${osd_partition}.*ceph data'
# ",
# logoutput => true,
# } ->
#
class { 'ceph::osds': }
}
class iaas::role::storage (
# $cluster_vlan = undef,
$cluster_ipaddress = undef,
$cluster_netmask = undef,
$osd_disk = undef,
$osd_partition = undef,
$osd_uuid = undef,
) {
# Base
class { 'iaas::profile::base': } ->
# # Ceph cluster network
# network_config { "eth0.${cluster_vlan}":
# ensure => 'present',
# family => 'inet',
# method => 'static',
# ipaddress => $cluster_ipaddress,
# netmask => $cluster_netmask,
# onboot => 'true',
# } ->
# exec { "ifup_eth0.${cluster_vlan}":
# command => "ifup eth0.${cluster_vlan}",
# } ->
# Ceph
class { 'ceph::profile::base': } ->
class { 'ceph::profile::mon': } ->
class { 'ceph::keys': } ->
# exec { "ceph-osd-sgdisk-${osd_partition}": # Trick to use a partition for an OSD
# command => "sgdisk --change-name='${osd_partition}:ceph data' --partition-guid=${osd_partition}:${osd_uuid} --typecode=${osd_partition}:4fbd7e29-9d25-41b8-afd0-062c0ceff05d -- ${osd_disk} && partprobe",
# unless => "/bin/true # comment to satisfy puppet syntax requirements
# set -ex
# ceph-disk list 2> /dev/null | grep ' *${osd_disk}${osd_partition}.*ceph data'
# ",
# logoutput => true,
# } ->
class { 'ceph::profile::osd': } ->
# Openstack pools
ceph::pool { 'images':
pg_num => 128,
}
ceph::pool { 'volumes':
pg_num => 128,
}
ceph::pool { 'vms':
pg_num => 128,
}
ceph::pool { 'backups':
pg_num => 128,
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment