Browse Source

MOS-9 integration:

  - Complete integration for deploying MOS-9 with PLUMgrid
  - Add support for paralell installation feature in MOS9
  - Add missing paramters in plumlib.ini

Change-Id: Id7f3c0bdb1c57e35787178a6fdcba5a262fe6108
Ticket: [SOL-1063, SOL-1105, SOL-1170, SOL-1175, SOL-1157]
Signed-off-by: mshahzeb <mshahzeb@plumgrid.com>
changes/64/360364/4
mshahzeb 2 years ago
parent
commit
da15e2cdd7

+ 3
- 0
deployment_scripts/post_pg_license.sh View File

@@ -25,6 +25,9 @@ set -x
25 25
 
26 26
 if [[ ! -f "/root/post_director" ]];then
27 27
 
28
+  #Restart plumgrid service before posting license
29
+  service plumgrid restart
30
+
28 31
   #Wait for the platform to come up
29 32
   sleep 5
30 33
   retry_cnt=0

+ 3
- 0
deployment_scripts/puppet/manifests/director.pp View File

@@ -154,9 +154,12 @@ class { '::neutron::plugins::plumgrid':
154 154
   controller_priv_host         => $service_endpoint,
155 155
   connection                   => $neutron_db_uri,
156 156
   nova_metadata_ip             => '169.254.169.254',
157
+  nova_metadata_subnet         => '169.254.169.252/30',
157 158
   nova_metadata_port           => '8775',
158 159
   metadata_proxy_shared_secret => $metadata_secret,
159 160
   package_ensure               => 'latest',
161
+  identity_version             => 'v3',
162
+  user_domain_name             => 'Default'
160 163
 }
161 164
 
162 165
 exec { "neutron-db-manage upgrade heads":

+ 24
- 0
deployment_scripts/puppet/manifests/director_fixes.pp View File

@@ -32,3 +32,27 @@ file_line { 'ensure no port conflict between apache-keystone':
32 32
   ensure  => 'absent',
33 33
   require => File['/etc/apache2/ports.conf']
34 34
 }
35
+
36
+ini_setting { 'Add Project domain name variable to plumlib.ini':
37
+  ensure  => 'present',
38
+  path    => '/etc/neutron/plugins/plumgrid/plumlib.ini',
39
+  section => 'keystone_authtoken',
40
+  setting => 'user_domain_name',
41
+  value   => 'Default',
42
+}
43
+
44
+ini_setting { 'Add enable_reverse_flow paramater in plumlib.ini':
45
+  ensure  => 'present',
46
+  path    => '/etc/neutron/plugins/plumgrid/plumlib.ini',
47
+  section => 'PLUMgridLibrary',
48
+  setting => 'enable_reverse_flow_tap',
49
+  value   => 'True',
50
+}
51
+
52
+ini_setting { 'Add nova_metaconfig paramater in plumlib.ini':
53
+  ensure  => 'present',
54
+  path    => '/etc/neutron/plugins/plumgrid/plumlib.ini',
55
+  section => 'PLUMgridLibrary',
56
+  setting => 'nova_metaconfig',
57
+  value   => 'True',
58
+}

+ 3
- 11
deployment_scripts/puppet/manifests/disable_openvswitch.pp View File

@@ -15,10 +15,9 @@
15 15
 
16 16
 notice('MODULAR: plumgrid/disable_ovs.pp')
17 17
 
18
-file_line { 'Disable ovs in globals.yaml':
19
-  path     => '/etc/hiera/globals.yaml',
20
-  line     => '  use_ovs: false',
21
-  match    => 'use_ovs',
18
+file { '/etc/hiera/plugins/plumgrid.yaml':
19
+  ensure  => file,
20
+  content => 'use_ovs: false',
22 21
 }
23 22
 
24 23
 file_line { 'Replace provider ovs with lnx':
@@ -27,10 +26,3 @@ file_line { 'Replace provider ovs with lnx':
27 26
   match    => '    provider: ovs',
28 27
   multiple => true,
29 28
 }
30
-
31
-file_line { 'Replace provider ovs with lnx in globals.yaml':
32
-  path     => '/etc/hiera/globals.yaml',
33
-  line     => '        provider: lnx',
34
-  match    => '        provider: ovs',
35
-  multiple => true,
36
-}

+ 10
- 22
deployment_tasks.yaml View File

@@ -15,8 +15,6 @@
15 15
   type: skipped
16 16
 - id: openstack-network-routers-ha
17 17
   type: skipped
18
-- id: openstack-network-compute-nova
19
-  type: skipped
20 18
 # Skip Neutron agents
21 19
 - id: primary-openstack-network-agents-l3
22 20
   type: skipped
@@ -50,18 +48,8 @@
50 48
     puppet_modules: puppet/modules:/etc/puppet/modules
51 49
     timeout: 120
52 50
 
53
-- id: openstack-network-plumgrid-compute-nova
54
-  groups: ['compute']
55
-  required_for: [openstack-network-end]
56
-  requires: [openstack-network-common-config]
57
-  type: puppet
58
-  parameters:
59
-    puppet_manifest: puppet/manifests/plumgrid_nova_compute.pp
60
-    puppet_modules: puppet/modules/:/etc/puppet/modules/
61
-    timeout: 1440
62
-
63 51
 - id: pgtools-support
64
-  role: ['controller', 'primary-controller']
52
+  groups: ['controller', 'primary-controller']
65 53
   required_for: [post_deployment_end]
66 54
   requires: [post_deployment_start]
67 55
   type: puppet
@@ -71,7 +59,7 @@
71 59
     timeout: 3000
72 60
 
73 61
 - id: check-pgzone
74
-  role: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
62
+  groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
75 63
   required_for: [post_deployment_end, pg_common]
76 64
   requires: [post_deployment_start]
77 65
   type: puppet
@@ -81,7 +69,7 @@
81 69
     timeout: 720
82 70
 
83 71
 - id: pg_common
84
-  role: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
72
+  groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
85 73
   required_for: [post_deployment_end, setup-director]
86 74
   requires: [post_deployment_start, check-pgzone, configure_default_route]
87 75
   type: puppet
@@ -91,7 +79,7 @@
91 79
     timeout: 3000
92 80
 
93 81
 - id: setup-director
94
-  role: ['controller', 'primary-controller']
82
+  groups: ['controller', 'primary-controller']
95 83
   required_for: [post_deployment_end, director-fixes]
96 84
   requires: [post_deployment_start, pg_common]
97 85
   type: puppet
@@ -101,7 +89,7 @@
101 89
     timeout: 3000
102 90
 
103 91
 - id: director-fixes
104
-  role: ['controller', 'primary-controller']
92
+  groups: ['controller', 'primary-controller']
105 93
   required_for: [post_deployment_end, post_pg_license]
106 94
   requires: [post_deployment_start, setup-director]
107 95
   type: puppet
@@ -129,9 +117,9 @@
129 117
     timeout: 3000
130 118
 
131 119
 - id: setup-edge
132
-  role: ['compute']
133
-  required_for: [post_deployment_end, setup-gateway]
134
-  requires: [post_deployment_start, solution-api]
120
+  groups: ['compute']
121
+  required_for: [post_deployment_end]
122
+  requires: [post_deployment_start, solution-api, pg_common]
135 123
   type: puppet
136 124
   parameters:
137 125
     puppet_manifest: puppet/manifests/edge.pp
@@ -139,9 +127,9 @@
139 127
     timeout: 3000
140 128
 
141 129
 - id: setup-gateway
142
-  role: ['PLUMgrid-Gateway']
130
+  groups: ['PLUMgrid-Gateway']
143 131
   required_for: [post_deployment_end]
144
-  requires: [post_deployment_start, setup-edge]
132
+  requires: [post_deployment_start, solution-api, pg_common]
145 133
   type: puppet
146 134
   parameters:
147 135
     puppet_manifest: puppet/manifests/gateway.pp

+ 3
- 3
metadata.yaml View File

@@ -3,11 +3,11 @@ name: plumgrid
3 3
 # Human-readable name for your plugin
4 4
 title: PLUMgrid plugin
5 5
 # Plugin version
6
-version: '2.0.0'
6
+version: '3.0.0'
7 7
 # Description
8 8
 description: This plugin enables the usage of PLUMgrid ONS as the network backend.
9 9
 # Required fuel version
10
-fuel_version: ['8.0']
10
+fuel_version: ['9.0']
11 11
 # Specify license of your plugin
12 12
 licenses: ['Apache License Version 2.0']
13 13
 authors: ['javeriak@plumgrid.com', 'abdullah.khan@plumgrid.com']
@@ -17,7 +17,7 @@ groups: ['network']
17 17
 # The plugin is compatible with releases in the list
18 18
 releases:
19 19
   - os: ubuntu
20
-    version: liberty-8.0
20
+    version: mitaka-9.0
21 21
     mode: ['ha', 'multinode']
22 22
     deployment_scripts_path: deployment_scripts/
23 23
     repository_path: repositories/ubuntu

Loading…
Cancel
Save