Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Drop extraconfig for neutron-nuage.yaml"
[apex-tripleo-heat-templates.git]
/
puppet
/
hieradata
/
controller.yaml
diff --git
a/puppet/hieradata/controller.yaml
b/puppet/hieradata/controller.yaml
index
7724f17
..
7db2b5d
100644
(file)
--- a/
puppet/hieradata/controller.yaml
+++ b/
puppet/hieradata/controller.yaml
@@
-1,7
+1,6
@@
# Hiera data here applies to all controller nodes
nova::api::enabled: true
# Hiera data here applies to all controller nodes
nova::api::enabled: true
-nova::consoleauth::enabled: true
nova::vncproxy::enabled: true
# gnocchi
nova::vncproxy::enabled: true
# gnocchi
@@
-187,13
+186,13
@@
controller_classes: []
# firewall
tripleo::firewall::firewall_rules:
'101 mongodb_config':
# firewall
tripleo::firewall::firewall_rules:
'101 mongodb_config':
- port: 27019
+
d
port: 27019
'102 mongodb_sharding':
'102 mongodb_sharding':
- port: 27018
+
d
port: 27018
'103 mongod':
'103 mongod':
- port: 27017
+
d
port: 27017
'104 mysql galera':
'104 mysql galera':
- port:
+
d
port:
- 873
- 3306
- 4444
- 873
- 3306
- 4444
@@
-201,37
+200,37
@@
tripleo::firewall::firewall_rules:
- 4568
- 9200
'105 ntp':
- 4568
- 9200
'105 ntp':
- port: 123
+
d
port: 123
proto: udp
'106 vrrp':
proto: vrrp
'107 haproxy stats':
proto: udp
'106 vrrp':
proto: vrrp
'107 haproxy stats':
- port: 1993
+
d
port: 1993
'108 redis':
'108 redis':
- port:
+
d
port:
- 6379
- 26379
'109 rabbitmq':
- 6379
- 26379
'109 rabbitmq':
- port:
+
d
port:
- 5672
- 35672
'110 ceph':
- 5672
- 35672
'110 ceph':
- port:
+
d
port:
- 6789
- '6800-6810'
'111 keystone':
- 6789
- '6800-6810'
'111 keystone':
- port:
+
d
port:
- 5000
- 13000
- 35357
- 13357
'112 glance':
- 5000
- 13000
- 35357
- 13357
'112 glance':
- port:
+
d
port:
- 9292
- 9191
- 13292
'113 nova':
- 9292
- 9191
- 13292
'113 nova':
- port:
+
d
port:
- 6080
- 13080
- 8773
- 6080
- 13080
- 8773
@@
-240,43
+239,43
@@
tripleo::firewall::firewall_rules:
- 13774
- 8775
'114 neutron server':
- 13774
- 8775
'114 neutron server':
- port:
+
d
port:
- 9696
- 13696
'115 neutron dhcp input':
proto: 'udp'
- 9696
- 13696
'115 neutron dhcp input':
proto: 'udp'
- port: 67
+
d
port: 67
'116 neutron dhcp output':
proto: 'udp'
chain: 'OUTPUT'
'116 neutron dhcp output':
proto: 'udp'
chain: 'OUTPUT'
- port: 68
+
d
port: 68
'118 neutron vxlan networks':
proto: 'udp'
'118 neutron vxlan networks':
proto: 'udp'
- port: 4789
+
d
port: 4789
'119 cinder':
'119 cinder':
- port:
+
d
port:
- 8776
- 13776
'120 iscsi initiator':
- 8776
- 13776
'120 iscsi initiator':
- port: 3260
+
d
port: 3260
'121 memcached':
'121 memcached':
- port: 11211
+
d
port: 11211
'122 swift proxy':
'122 swift proxy':
- port:
+
d
port:
- 8080
- 13808
'123 swift storage':
- 8080
- 13808
'123 swift storage':
- port:
+
d
port:
- 873
- 6000
- 6001
- 6002
'124 ceilometer':
- 873
- 6000
- 6001
- 6002
'124 ceilometer':
- port:
+
d
port:
- 8777
- 13777
'125 heat':
- 8777
- 13777
'125 heat':
- port:
+
d
port:
- 8000
- 13800
- 8003
- 8000
- 13800
- 8003
@@
-284,17
+283,30
@@
tripleo::firewall::firewall_rules:
- 8004
- 13004
'126 horizon':
- 8004
- 13004
'126 horizon':
- port:
+
d
port:
- 80
- 443
'127 snmp':
- 80
- 443
'127 snmp':
- port: 161
+
d
port: 161
proto: 'udp'
'128 aodh':
proto: 'udp'
'128 aodh':
- port:
+
d
port:
- 8042
- 13042
'129 gnocchi-api':
- 8042
- 13042
'129 gnocchi-api':
- port:
+
d
port:
- 8041
- 13041
- 8041
- 13041
+ '130 pacemaker tcp':
+ proto: 'tcp'
+ dport:
+ - 2224
+ - 3121
+ - 21064
+ '131 pacemaker udp':
+ proto: 'udp'
+ dport: 5405
+ '132 sahara':
+ dport:
+ - 8386
+ - 13386