diff --git a/roles/compute/nova_common.pp b/roles/compute/compute_common.pp similarity index 95% rename from roles/compute/nova_common.pp rename to roles/compute/compute_common.pp index 21691cc1..7f0c7dbe 100644 --- a/roles/compute/nova_common.pp +++ b/roles/compute/compute_common.pp @@ -18,9 +18,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Nova Common (controller/compute) +# Compute Common (controller/compute) # -class os_nova_common { +# +class os_compute_common { if !defined(Resource['nova_config']) { resources { 'nova_config': purge => true; @@ -46,4 +47,4 @@ class os_nova_common { 'DEFAULT/syslog_log_facility': value => 'LOG_LOCAL0'; } -} # Class:: os_nova_common +} diff --git a/roles/compute/nova_controller.pp b/roles/compute/compute_controller.pp similarity index 96% rename from roles/compute/nova_controller.pp rename to roles/compute/compute_controller.pp index 871be805..67387f30 100644 --- a/roles/compute/nova_controller.pp +++ b/roles/compute/compute_controller.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Nova controller node +# Compute controller node # -class os_nova_controller( +class os_computr_controller( $local_ip = $ipaddress_eth1, ){ diff --git a/roles/compute/nova_compute.pp b/roles/compute/compute_hypervisor.pp similarity index 97% rename from roles/compute/nova_compute.pp rename to roles/compute/compute_hypervisor.pp index 5730e092..e7f5442f 100644 --- a/roles/compute/nova_compute.pp +++ b/roles/compute/compute_hypervisor.pp @@ -17,10 +17,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Nova Compute node +# Hypervisor Compute node # -class os_nova_compute( +class os_compute_hypervisor( $local_ip = $ipaddress_eth1, $libvirt_type = 'kvm', ) { diff --git a/roles/dashboard/dashboard.pp b/roles/dashboard/dashboard.pp new file mode 100644 index 00000000..cbad9e63 --- /dev/null +++ b/roles/dashboard/dashboard.pp @@ -0,0 +1,25 @@ +# +# Copyright (C) 2013 eNovance SAS +# +# Authors: Mehdi Abaakouk +# Emilien Macchi +# Francois Charlier +# Sebastien Badia +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# Horizon dashboard + +class os_dashboard { + +} diff --git a/roles/dashboard/horizon_server.pp b/roles/dashboard/horizon_server.pp deleted file mode 100644 index 2b53bbd1..00000000 --- a/roles/dashboard/horizon_server.pp +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2013 eNovance SAS -# -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Sebastien Badia -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Horizon dashboard - -class os_role_horizon { - -# package{ 'openstack-dashboard-apache': -# ensure => latest -# } - - apache::vhost { 'horizon': - servername => $::fqdn, - port => $os_params::horizon_port, - docroot => '/var/www', - docroot_owner => 'www-data', - docroot_group => 'www-data', - error_log_file => "${::fqdn}_horizon_error.log", - access_log_file => "${::fqdn}_horizon_access.log", - configure_firewall => false, - custom_fragment => inline_template(' -WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -WSGIDaemonProcess horizon user=www-data group=www-data - Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static - - DocumentRoot /var/www - - - AllowOverride None - - - - Order allow,deny - Allow from all - - - Alias /static/horizon /usr/share/pyshared/horizon/static/horizon - - - Order allow,deny - Allow from all - - - - Order allow,deny - Allow from all - -') - } - - -} # Class:: os_role_horizon diff --git a/roles/identity/keystone-server.pp b/roles/identity/identity-controller.pp similarity index 99% rename from roles/identity/keystone-server.pp rename to roles/identity/identity-controller.pp index bb3ccc25..0b3f4764 100644 --- a/roles/identity/keystone-server.pp +++ b/roles/identity/identity-controller.pp @@ -17,7 +17,7 @@ # License for the specific language governing permissions and limitations # under the License. -class os_keystone_server ( +class os_identity_controller ( $local_ip = $ipaddress_eth0, ){ diff --git a/roles/image/glance_server.pp b/roles/image/image_controller.pp similarity index 96% rename from roles/image/glance_server.pp rename to roles/image/image_controller.pp index f33cfc3f..6dd2da9e 100644 --- a/roles/image/glance_server.pp +++ b/roles/image/image_controller.pp @@ -18,12 +18,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Glance controller +# Image controller +# +# Class:: os_image_controller +# -# Class:: os_role_glance -# -# -class os_role_glance { +class os_image_controller { $encoded_glance_user = uriescape($os_params::glance_db_user) $encoded_glance_password = uriescape($os_params::glance_db_password) diff --git a/roles/metering/ceilometer_common.pp b/roles/metering/metering_common.pp similarity index 98% rename from roles/metering/ceilometer_common.pp rename to roles/metering/metering_common.pp index 457e4dcf..72921e9d 100644 --- a/roles/metering/ceilometer_common.pp +++ b/roles/metering/metering_common.pp @@ -20,7 +20,7 @@ # Used by Controller, Storage, Network and Compute nodes -class os_ceilometer_common { +class os_metering_common { class { 'ceilometer': metering_secret => $os_params::ceilometer_secret, diff --git a/roles/metering/ceilometer_server.pp b/roles/metering/metering_server.pp similarity index 96% rename from roles/metering/ceilometer_server.pp rename to roles/metering/metering_server.pp index fca809c5..fdc06851 100644 --- a/roles/metering/ceilometer_server.pp +++ b/roles/metering/metering_server.pp @@ -17,9 +17,9 @@ # License for the specific language governing permissions and limitations # under the License. -# Ceilometer server nodes +# Metering server nodes -class os_ceilometer_server{ +class os_metering_server{ # Install MongoDB database class { 'ceilometer::db': diff --git a/roles/network/neutron_compute.pp b/roles/network/network_compute.pp similarity index 93% rename from roles/network/neutron_compute.pp rename to roles/network/network_compute.pp index 8f4cf11c..e836ed04 100644 --- a/roles/network/neutron_compute.pp +++ b/roles/network/network_compute.pp @@ -17,10 +17,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Nutron Compute node (Agent) +# Network Compute node (Agent) # -class os_neutron_compute( +class os_network_compute( ) { } diff --git a/roles/network/neutron_controller.pp b/roles/network/network_controller.pp similarity index 91% rename from roles/network/neutron_controller.pp rename to roles/network/network_controller.pp index 29093b29..94d57a1d 100644 --- a/roles/network/neutron_controller.pp +++ b/roles/network/network_controller.pp @@ -17,10 +17,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Nutron Controller node (API + Scheduler) +# Network Controller node (API + Scheduler) # -class os_neutron_controller( +class os_network_controller( ) { } diff --git a/roles/network/neutron_dhcp.pp b/roles/network/network_dhcp.pp similarity index 94% rename from roles/network/neutron_dhcp.pp rename to roles/network/network_dhcp.pp index ef4de32f..bc641aaf 100644 --- a/roles/network/neutron_dhcp.pp +++ b/roles/network/network_dhcp.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Neutron DHCP node +# Network DHCP node # -class os_neutron_dhcp( +class os_network_dhcp( ) { class { 'neutron::agents::dhcp': diff --git a/roles/network/neutron_l3.pp b/roles/network/network_l3.pp similarity index 96% rename from roles/network/neutron_l3.pp rename to roles/network/network_l3.pp index c01cce3d..fc6fb379 100644 --- a/roles/network/neutron_l3.pp +++ b/roles/network/network_l3.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Neutron L3 node +# Network L3 node # -class os_neutron_l3( +class os_network_l3( ) { class { 'neutron::agents::l3': diff --git a/roles/network/neutron_lb.pp b/roles/network/network_lb.pp similarity index 94% rename from roles/network/neutron_lb.pp rename to roles/network/network_lb.pp index 73154a9d..3c930737 100644 --- a/roles/network/neutron_lb.pp +++ b/roles/network/network_lb.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Neutron LBaaS node +# Network LBaaS node # -class os_neutron_lbaas( +class os_network_lbaas( ) { class { 'neutron::agents::lbaas': diff --git a/roles/network/neutron_metadata.pp b/roles/network/network_metadata.pp similarity index 95% rename from roles/network/neutron_metadata.pp rename to roles/network/network_metadata.pp index abf7d3ed..edc5a3d1 100644 --- a/roles/network/neutron_metadata.pp +++ b/roles/network/network_metadata.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Neutron Metadata node +# Network Metadata node # -class os_neutron_metadata( +class os_network_metadata( ) { class { 'neutron::agents::metadata': diff --git a/roles/network/neutron_vpn.pp b/roles/network/network_vpn.pp similarity index 94% rename from roles/network/neutron_vpn.pp rename to roles/network/network_vpn.pp index 9298e30e..9a2737f2 100644 --- a/roles/network/neutron_vpn.pp +++ b/roles/network/network_vpn.pp @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. # -# Neutron VPNaaS node +# Network VPNaaS node # -class os_neutron_vpn( +class os_network_vpn( ) { class { 'neutron::agents::vpnaas': diff --git a/roles/orchestration/heat_server.pp b/roles/orchestration/orchestration_controller.pp similarity index 96% rename from roles/orchestration/heat_server.pp rename to roles/orchestration/orchestration_controller.pp index 21be85c8..ed5632fd 100644 --- a/roles/orchestration/heat_server.pp +++ b/roles/orchestration/orchestration_controller.pp @@ -16,9 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. # -# Heat server +# Orchestration controller node # -class os_role_heat { +class os_orchestration_controller { class { 'heat': keystone_host => $os_params::ks_heat_public_host, keystone_port => $os_params::ks_heat_public_port, diff --git a/roles/volume/cinder_storage.pp b/roles/volume/cinder_storage.pp deleted file mode 100644 index e69de29b..00000000 diff --git a/roles/volume/cinder_controller.pp b/roles/volume/volume_controller.pp similarity index 84% rename from roles/volume/cinder_controller.pp rename to roles/volume/volume_controller.pp index 5e944b5b..1ea50d3d 100644 --- a/roles/volume/cinder_controller.pp +++ b/roles/volume/volume_controller.pp @@ -18,9 +18,9 @@ # License for the specific language governing permissions and limitations # under the License. # -# Cinder controller +# Volume controller -class os_role_cinder_controller { +class os_volume_controller { $encoded_user = uriescape($os_params::cinder_db_user) $encoded_password = uriescape($os_params::cinder_db_password) @@ -41,13 +41,6 @@ class os_role_cinder_controller { keystone_auth_host => $os_params::ks_keystone_internal_host, } - class { 'cinder::volume::rbd': - rbd_pool => $os_params::cinder_rbd_pool, - glance_api_version => $os_params::glance_api_version, - rbd_user => $os_params::cinder_rbd_user, - rbd_secret_uuid => $os_params::cinder_rbd_secret_uuid - } - class { 'cinder::ceilometer': } cinder_config{ diff --git a/roles/volume/volume_storage.pp b/roles/volume/volume_storage.pp new file mode 100644 index 00000000..f47c5a57 --- /dev/null +++ b/roles/volume/volume_storage.pp @@ -0,0 +1,28 @@ +# +# Copyright (C) 2013 eNovance SAS +# +# Author: Emilien Macchi +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# Volume storage +# + +class os_volume_storage { + class { 'cinder::volume::rbd': + rbd_pool => $os_params::cinder_rbd_pool, + glance_api_version => $os_params::glance_api_version, + rbd_user => $os_params::cinder_rbd_user, + rbd_secret_uuid => $os_params::cinder_rbd_secret_uuid + } +} diff --git a/site.pp b/site.pp index 867bbb31..d1ab079c 100644 --- a/site.pp +++ b/site.pp @@ -62,13 +62,13 @@ node 'os-ci-test3.enovance.com', 'os-ci-test13.enovance.com', 'os-ci-test4.enova } ## Metering - class {'os_ceilometer_common':} - class {'os_ceilometer_server':} + class {'os_metering_common':} + class {'os_metering_server':} # Enforce using Ceilometer Agent central on one node (should be fixed in Icehouse): class {'ceilometer::agent::central': } ## Identity - class {'os_keystone_server': + class {'os_identity_controller': local_ip => $ipaddress_eth0, } @@ -91,7 +91,7 @@ node 'os-ci-test3.enovance.com', 'os-ci-test13.enovance.com', 'os-ci-test4.enova node 'os-ci-test8.enovance.com', 'os-ci-test9.enovance.com', 'os-ci-test12.enovance.com' inherits common{ ## Metering - class {'os_ceilometer_common':} + class {'os_metering_common':} ## Object Storage class { 'os_swift_storage':