summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-24 10:06:13 +0000
committerGerrit Code Review <review@openstack.org>2017-03-24 10:06:13 +0000
commit6f542cc86657f93b841194c31e100479561732b8 (patch)
treee1b39dc1b6c622fcf52c1c76d677c74df9562957
parentccdab4a8d5451f74d28176b43852b7afcc8fec20 (diff)
parent97c9ca2c5fca12adaa2da8f777898af3f60823fc (diff)
Merge "Port for distributed serialization added"
-rw-r--r--deployment/puppet/fuel/manifests/iptables.pp49
-rw-r--r--deployment/puppet/fuel/manifests/params.pp1
2 files changed, 31 insertions, 19 deletions
diff --git a/deployment/puppet/fuel/manifests/iptables.pp b/deployment/puppet/fuel/manifests/iptables.pp
index fc0afb7..e731d10 100644
--- a/deployment/puppet/fuel/manifests/iptables.pp
+++ b/deployment/puppet/fuel/manifests/iptables.pp
@@ -2,25 +2,26 @@ class fuel::iptables (
2 $network_address, 2 $network_address,
3 $network_cidr, 3 $network_cidr,
4 4
5 $admin_iface = $::fuel::params::admin_interface, 5 $admin_iface = $::fuel::params::admin_interface,
6 $ssh_port = '22', 6 $ssh_port = '22',
7 $ssh_network = '0.0.0.0/0', 7 $ssh_network = '0.0.0.0/0',
8 $ssh_rseconds = 60, 8 $ssh_rseconds = 60,
9 $ssh_rhitcount = 4, 9 $ssh_rhitcount = 4,
10 $nailgun_web_port = $::fuel::params::nailgun_port, 10 $nailgun_web_port = $::fuel::params::nailgun_port,
11 $nailgun_internal_port = $::fuel::params::nailgun_internal_port, 11 $nailgun_internal_port = $::fuel::params::nailgun_internal_port,
12 $nailgun_repo_port = $::fuel::params::repo_port, 12 $nailgun_serialization_port = $::fuel::params::nailgun_serialization_port,
13 $postgres_port = $::fuel::params::db_port, 13 $nailgun_repo_port = $::fuel::params::repo_port,
14 $ostf_port = $::fuel::params::ostf_port, 14 $postgres_port = $::fuel::params::db_port,
15 $rsync_port = '873', 15 $ostf_port = $::fuel::params::ostf_port,
16 $rsyslog_port = '514', 16 $rsync_port = '873',
17 $ntp_port = '123', 17 $rsyslog_port = '514',
18 $rabbitmq_ports = ['4369','5672','61613'], 18 $ntp_port = '123',
19 $rabbitmq_admin_port = '15672', 19 $rabbitmq_ports = ['4369','5672','61613'],
20 $fuelweb_port = $::fuel::params::nailgun_ssl_port, 20 $rabbitmq_admin_port = '15672',
21 $keystone_port = $::fuel::params::keystone_port, 21 $fuelweb_port = $::fuel::params::nailgun_ssl_port,
22 $keystone_admin_port = $::fuel::params::keystone_admin_port, 22 $keystone_port = $::fuel::params::keystone_port,
23 $chain = 'INPUT', 23 $keystone_admin_port = $::fuel::params::keystone_admin_port,
24 $chain = 'INPUT',
24 ) inherits fuel::params { 25 ) inherits fuel::params {
25 26
26 #Enable cobbler's iptables rules even if Cobbler not called 27 #Enable cobbler's iptables rules even if Cobbler not called
@@ -185,6 +186,16 @@ class fuel::iptables (
185 state => ['NEW'], 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 firewall { '070 nailgun_internal_block_ext': 199 firewall { '070 nailgun_internal_block_ext':
189 chain => $chain, 200 chain => $chain,
190 table => 'filter', 201 table => 'filter',
diff --git a/deployment/puppet/fuel/manifests/params.pp b/deployment/puppet/fuel/manifests/params.pp
index e82a6af..fe58477 100644
--- a/deployment/puppet/fuel/manifests/params.pp
+++ b/deployment/puppet/fuel/manifests/params.pp
@@ -120,6 +120,7 @@ class fuel::params {
120 $nailgun_host = '127.0.0.1' 120 $nailgun_host = '127.0.0.1'
121 $nailgun_port = '8000' 121 $nailgun_port = '8000'
122 $nailgun_internal_port = '8001' 122 $nailgun_internal_port = '8001'
123 $nailgun_serialization_port = '8002'
123 $nailgun_ssl_port = '8443' 124 $nailgun_ssl_port = '8443'
124 125
125 $ostf_host = '127.0.0.1' 126 $ostf_host = '127.0.0.1'