Fixes for Centos support added

Change-Id: I8406b7daa5fc667edbe827f65de2d71aed629126

deployment_scripts/puppet/modules/apic/manifests/params.pp

@@ -1,14 +1,19 @@
 #Class apic::params
 class apic::params {
 
+    $package_apic_api           = 'python-apicapi'
+    $package_apic_svc           = 'neutron-driver-apic-svc'
+    $package_apic_agent         = 'neutron-driver-apic-agent'
+    $service_apic_svc_agent     = 'neutron-apic-service-agent'
+    $service_apic_host_agent    = 'neutron-apic-host-agent'
+
     case $::osfamily {
         'RedHat': {
+            $service_apic_svc_agent     = 'neutron-apic-service-agent'
+            $service_apic_host_agent    = 'neutron-apic-host-agent'
         }
 
         'Debian': {
-            $package_apic_svc           = 'neutron-driver-apic-svc'
-            $package_apic_agent         = 'neutron-driver-apic-agent'
-            $package_apic_api           = 'python-apicapi'
             $service_apic_svc_agent     = 'neutron-driver-apic-svc'
             $service_apic_host_agent    = 'neutron-driver-apic-agent'
         }

deployment_scripts/puppet/modules/gbp/manifests/heat.pp

@@ -12,7 +12,7 @@ class gbp::heat (
     }
 
     heat_config{
-        'DEFAULT/plugin_dirs'  : value => '/usr/lib/python2.7/dist-packages/gbpautomation/heat';
+        'DEFAULT/plugin_dirs'  : value => $::gbp::params::gbp_heat_plugin_path;
     }
 
 }

deployment_scripts/puppet/modules/gbp/manifests/horizon.pp

@@ -11,7 +11,20 @@ class gbp::horizon (
         name   => $::gbp::params::package_gbp_horizon,
     }
 
-    horizon::project{$enable_project:
-        project_dir  => $::gbp::params::gbp_horizon_project,
+    case $::osfamily {
+        'RedHat': {
+            include horizon::service
+            Package['gbp_horizon']  ~> Service['httpd']
+        }
+
+        'Debian': {
+            horizon::project{$enable_project:
+                project_dir  => $::gbp::params::gbp_horizon_project,
+            }
+        }
+
+        default: {
+            fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
+        }
     }
 }

deployment_scripts/puppet/modules/gbp/manifests/params.pp

@@ -5,6 +5,11 @@ class gbp::params {
 
     case $::osfamily {
         'RedHat': {
+            $package_gbp_client     = 'python-gbpclient'
+            $package_gbp_manage     = 'openstack-neutron-gbp'
+            $package_gbp_heat       = 'openstack-heat-gbp'
+            $package_gbp_horizon    = 'openstack-dashboard-gbp'
+            $gbp_heat_plugin_path   = '/usr/lib/python2.6/site-packages/gbpautomation/heat'
         }
 
         'Debian': {
@@ -13,6 +18,7 @@ class gbp::params {
             $package_gbp_heat       = 'python-group-based-policy-automation'
             $package_gbp_horizon    = 'python-group-based-policy-ui'
             $gbp_horizon_project    = '/usr/lib/python2.7/dist-packages/gbpui'
+            $gbp_heat_plugin_path   = '/usr/lib/python2.7/site-packages/gbpautomation/heat'
         }
 
         default: {

deployment_scripts/puppet/modules/horizon/manifests/params.pp

@@ -9,7 +9,7 @@ class horizon::params {
             $http_service   = 'httpd'
         }
         'Debian': {
-            $http_service       = 'apache2'
+            $http_service   = 'apache2'
         }
         default: {
             fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")

deployment_scripts/puppet/modules/neutron/manifests/config_apic.pp

@@ -19,7 +19,11 @@ class neutron::config_apic (
         'ml2_cisco_apic/apic_username':     value => $apic_username;
         'ml2_cisco_apic/apic_password':     value => $apic_password;
         'ml2_cisco_apic/apic_name_mapping': value => 'use_name' ;
-        'ml2_cisco_apic/root_helper':       value => 'sudo';
+    }
+    if $::osfamily == 'RedHat' {
+        neutron_plugin_ml2_cisco {
+            'ml2_cisco_apic/root_helper':   value => 'sudo';
+        }
     }
     if !empty($additional_config) {
         file_line{ 'additional_config':

environment_config.yaml

@@ -1,4 +1,8 @@
 attributes:
+  metadata:
+    restrictions:
+      - condition: "not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type == 'vlan')"
+        action: hide
   use_gbp:
     type: "checkbox"
     weight: 30

metadata.yaml

@@ -24,7 +24,7 @@ releases:
     version: 2014.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
-    repository_path: repositories/ubuntu
+    repository_path: repositories/centos
   - os: ubuntu
     version: 2014.2-6.1
     mode: ['ha', 'multinode']