Browse Source

Fixes for Centos support added

Change-Id: I8406b7daa5fc667edbe827f65de2d71aed629126
Nikita Koshikov 4 years ago
parent
commit
1c1ab2c5aa

+ 8
- 3
deployment_scripts/puppet/modules/apic/manifests/params.pp View File

@@ -1,14 +1,19 @@
1 1
 #Class apic::params
2 2
 class apic::params {
3 3
 
4
+    $package_apic_api           = 'python-apicapi'
5
+    $package_apic_svc           = 'neutron-driver-apic-svc'
6
+    $package_apic_agent         = 'neutron-driver-apic-agent'
7
+    $service_apic_svc_agent     = 'neutron-apic-service-agent'
8
+    $service_apic_host_agent    = 'neutron-apic-host-agent'
9
+
4 10
     case $::osfamily {
5 11
         'RedHat': {
12
+            $service_apic_svc_agent     = 'neutron-apic-service-agent'
13
+            $service_apic_host_agent    = 'neutron-apic-host-agent'
6 14
         }
7 15
 
8 16
         'Debian': {
9
-            $package_apic_svc           = 'neutron-driver-apic-svc'
10
-            $package_apic_agent         = 'neutron-driver-apic-agent'
11
-            $package_apic_api           = 'python-apicapi'
12 17
             $service_apic_svc_agent     = 'neutron-driver-apic-svc'
13 18
             $service_apic_host_agent    = 'neutron-driver-apic-agent'
14 19
         }

+ 1
- 1
deployment_scripts/puppet/modules/gbp/manifests/heat.pp View File

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

+ 15
- 2
deployment_scripts/puppet/modules/gbp/manifests/horizon.pp View File

@@ -11,7 +11,20 @@ class gbp::horizon (
11 11
         name   => $::gbp::params::package_gbp_horizon,
12 12
     }
13 13
 
14
-    horizon::project{$enable_project:
15
-        project_dir  => $::gbp::params::gbp_horizon_project,
14
+    case $::osfamily {
15
+        'RedHat': {
16
+            include horizon::service
17
+            Package['gbp_horizon']  ~> Service['httpd']
18
+        }
19
+
20
+        'Debian': {
21
+            horizon::project{$enable_project:
22
+                project_dir  => $::gbp::params::gbp_horizon_project,
23
+            }
24
+        }
25
+
26
+        default: {
27
+            fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
28
+        }
16 29
     }
17 30
 }

+ 6
- 0
deployment_scripts/puppet/modules/gbp/manifests/params.pp View File

@@ -5,6 +5,11 @@ class gbp::params {
5 5
 
6 6
     case $::osfamily {
7 7
         'RedHat': {
8
+            $package_gbp_client     = 'python-gbpclient'
9
+            $package_gbp_manage     = 'openstack-neutron-gbp'
10
+            $package_gbp_heat       = 'openstack-heat-gbp'
11
+            $package_gbp_horizon    = 'openstack-dashboard-gbp'
12
+            $gbp_heat_plugin_path   = '/usr/lib/python2.6/site-packages/gbpautomation/heat'
8 13
         }
9 14
 
10 15
         'Debian': {
@@ -13,6 +18,7 @@ class gbp::params {
13 18
             $package_gbp_heat       = 'python-group-based-policy-automation'
14 19
             $package_gbp_horizon    = 'python-group-based-policy-ui'
15 20
             $gbp_horizon_project    = '/usr/lib/python2.7/dist-packages/gbpui'
21
+            $gbp_heat_plugin_path   = '/usr/lib/python2.7/site-packages/gbpautomation/heat'
16 22
         }
17 23
 
18 24
         default: {

+ 1
- 1
deployment_scripts/puppet/modules/horizon/manifests/params.pp View File

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

+ 5
- 1
deployment_scripts/puppet/modules/neutron/manifests/config_apic.pp View File

@@ -19,7 +19,11 @@ class neutron::config_apic (
19 19
         'ml2_cisco_apic/apic_username':     value => $apic_username;
20 20
         'ml2_cisco_apic/apic_password':     value => $apic_password;
21 21
         'ml2_cisco_apic/apic_name_mapping': value => 'use_name' ;
22
-        'ml2_cisco_apic/root_helper':       value => 'sudo';
22
+    }
23
+    if $::osfamily == 'RedHat' {
24
+        neutron_plugin_ml2_cisco {
25
+            'ml2_cisco_apic/root_helper':   value => 'sudo';
26
+        }
23 27
     }
24 28
     if !empty($additional_config) {
25 29
         file_line{ 'additional_config':

+ 4
- 0
environment_config.yaml View File

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

+ 1
- 1
metadata.yaml View File

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

Loading…
Cancel
Save