Browse Source

Merge "Port for distributed serialization added"

Jenkins 2 years ago
parent
commit
6f542cc866

+ 30
- 19
deployment/puppet/fuel/manifests/iptables.pp View File

@@ -2,25 +2,26 @@ class fuel::iptables (
2 2
   $network_address,
3 3
   $network_cidr,
4 4
 
5
-  $admin_iface           = $::fuel::params::admin_interface,
6
-  $ssh_port              = '22',
7
-  $ssh_network           = '0.0.0.0/0',
8
-  $ssh_rseconds          = 60,
9
-  $ssh_rhitcount         = 4,
10
-  $nailgun_web_port      = $::fuel::params::nailgun_port,
11
-  $nailgun_internal_port = $::fuel::params::nailgun_internal_port,
12
-  $nailgun_repo_port     = $::fuel::params::repo_port,
13
-  $postgres_port         = $::fuel::params::db_port,
14
-  $ostf_port             = $::fuel::params::ostf_port,
15
-  $rsync_port            = '873',
16
-  $rsyslog_port          = '514',
17
-  $ntp_port              = '123',
18
-  $rabbitmq_ports        = ['4369','5672','61613'],
19
-  $rabbitmq_admin_port   = '15672',
20
-  $fuelweb_port          = $::fuel::params::nailgun_ssl_port,
21
-  $keystone_port         = $::fuel::params::keystone_port,
22
-  $keystone_admin_port   = $::fuel::params::keystone_admin_port,
23
-  $chain                 = 'INPUT',
5
+  $admin_iface                = $::fuel::params::admin_interface,
6
+  $ssh_port                   = '22',
7
+  $ssh_network                = '0.0.0.0/0',
8
+  $ssh_rseconds               = 60,
9
+  $ssh_rhitcount              = 4,
10
+  $nailgun_web_port           = $::fuel::params::nailgun_port,
11
+  $nailgun_internal_port      = $::fuel::params::nailgun_internal_port,
12
+  $nailgun_serialization_port = $::fuel::params::nailgun_serialization_port,
13
+  $nailgun_repo_port          = $::fuel::params::repo_port,
14
+  $postgres_port              = $::fuel::params::db_port,
15
+  $ostf_port                  = $::fuel::params::ostf_port,
16
+  $rsync_port                 = '873',
17
+  $rsyslog_port               = '514',
18
+  $ntp_port                   = '123',
19
+  $rabbitmq_ports             = ['4369','5672','61613'],
20
+  $rabbitmq_admin_port        = '15672',
21
+  $fuelweb_port               = $::fuel::params::nailgun_ssl_port,
22
+  $keystone_port              = $::fuel::params::keystone_port,
23
+  $keystone_admin_port        = $::fuel::params::keystone_admin_port,
24
+  $chain                      = 'INPUT',
24 25
   ) inherits fuel::params {
25 26
 
26 27
   #Enable cobbler's iptables rules even if Cobbler not called
@@ -185,6 +186,16 @@ class fuel::iptables (
185 186
     state   => ['NEW'],
186 187
   }
187 188
 
189
+  firewall { '065 nailgun_serialization_port':
190
+    chain   => $chain,
191
+    table   => 'filter',
192
+    dport   => $nailgun_serialization_port,
193
+    proto   => 'tcp',
194
+    iniface => $admin_iface,
195
+    action  => 'accept',
196
+    state   => ['NEW'],
197
+  }
198
+
188 199
   firewall { '070 nailgun_internal_block_ext':
189 200
     chain  => $chain,
190 201
     table  => 'filter',

+ 1
- 0
deployment/puppet/fuel/manifests/params.pp View File

@@ -120,6 +120,7 @@ class fuel::params {
120 120
   $nailgun_host                  = '127.0.0.1'
121 121
   $nailgun_port                  = '8000'
122 122
   $nailgun_internal_port         = '8001'
123
+  $nailgun_serialization_port    = '8002'
123 124
   $nailgun_ssl_port              = '8443'
124 125
 
125 126
   $ostf_host                     = '127.0.0.1'

Loading…
Cancel
Save