Refacto with new class names (except swift for now)

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

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
+}

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,
 ){
 

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',
 ) {

roles/dashboard/dashboard.pp

@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
+#
+# Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com>
+#          Emilien Macchi <emilien.macchi@enovance.com>
+#          Francois Charlier <francois.charlier@enovance.com>
+#          Sebastien Badia <sebastien.badia@enovance.com>
+#
+# 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 {
+
+}

roles/dashboard/horizon_server.pp

@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
-#
-# Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com>
-#          Emilien Macchi <emilien.macchi@enovance.com>
-#          Francois Charlier <francois.charlier@enovance.com>
-#          Sebastien Badia <sebastien.badia@enovance.com>
-#
-# 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
-
-    <Directory />
-        AllowOverride None
-    </Directory>
-
-    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
-
-    <Directory /usr/share/pyshared/horizon/static/horizon>
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
-        Order allow,deny
-        Allow from all
-    </Directory>
-')
-  }
-
-
-} # Class:: os_role_horizon

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,
 ){
 

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)
 

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,

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':

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(
 ) {
 
 }

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(
 ) {
 
 }

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':

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':

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':

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':

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':

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,

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{

roles/volume/volume_storage.pp

@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
+#
+# Author: Emilien Macchi <emilien.macchi@enovance.com>
+#
+# 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
+  }
+}

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':