Browse Source

Remove port 35357

This removes port 35357 for Keystone as will be
done in [1] and changes all references to that port.

I can't see that packstack will need to keep the support
for both ports as done in TripleO recently [2].

[1] https://review.openstack.org/#/c/619257/
[2] https://review.openstack.org/#/c/627793/

Change-Id: I4b6dcd396e1e5e666e7429929240bca7aadbc3bb
Tobias Urdin 3 months ago
parent
commit
926bc175be

+ 2
- 2
packstack/plugins/keystone_100.py View File

@@ -776,7 +776,7 @@ def create_manifest(config, messages):
776 776
     config['CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'] = "http://%s:5000/" % (
777 777
         config['CONFIG_KEYSTONE_HOST_URL']
778 778
     )
779
-    config['CONFIG_KEYSTONE_ADMIN_URL'] = "http://%s:35357" % (
779
+    config['CONFIG_KEYSTONE_ADMIN_URL'] = "http://%s:5000" % (
780 780
         config['CONFIG_KEYSTONE_HOST_URL']
781 781
     )
782 782
 
@@ -786,6 +786,6 @@ def create_manifest(config, messages):
786 786
     fw_details[key]['host'] = "ALL"
787 787
     fw_details[key]['service_name'] = "keystone"
788 788
     fw_details[key]['chain'] = "INPUT"
789
-    fw_details[key]['ports'] = ['5000', '35357']
789
+    fw_details[key]['ports'] = ['5000']
790 790
     fw_details[key]['proto'] = "tcp"
791 791
     config['FIREWALL_KEYSTONE_RULES'] = fw_details

+ 0
- 2
packstack/puppet/modules/packstack/manifests/apache.pp View File

@@ -25,8 +25,6 @@ class packstack::apache ()
25 25
 
26 26
     # Keystone port
27 27
     apache::listen { '5000': }
28
-    # Keystone admin port
29
-    apache::listen { '35357': }
30 28
 
31 29
     if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
32 30
       if hiera('CONFIG_CEILOMETER_SERVICE_NAME') == 'httpd' {

+ 1
- 1
packstack/puppet/modules/packstack/manifests/magnum.pp View File

@@ -14,7 +14,7 @@ class packstack::magnum ()
14 14
     $magnum_url = "${magnum_protocol}://${magnum_host}:$magnum_port/v1"
15 15
     class { '::magnum::keystone::authtoken':
16 16
       www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
17
-      auth_url             => "${magnum_protocol}://${magnum_host}:35357",
17
+      auth_url             => "${magnum_protocol}://${magnum_host}:5000",
18 18
       auth_version         => 'v3',
19 19
       username             => 'magnum',
20 20
       password             => hiera('CONFIG_MAGNUM_KS_PW'),

+ 0
- 14
run_tests.sh View File

@@ -117,20 +117,6 @@ if [ $(id -u) != 0 ]; then
117 117
     $SUDO service sshd restart
118 118
 fi
119 119
 
120
-# Sometimes keystone admin port is used as ephemeral port for other connections and gate jobs fail with httpd error 'Address already in use'.
121
-# We reserve port 35357 at the beginning of the job execution to mitigate this issue as much as possible.
122
-# Similar hack is done in devstack https://github.com/openstack-dev/devstack/blob/master/tools/fixup_stuff.sh#L53-L68
123
-
124
-# Get any currently reserved ports, strip off leading whitespace
125
-keystone_port=35357
126
-reserved_ports=$(sysctl net.ipv4.ip_local_reserved_ports | awk -F'=' '{print $2;}' | sed 's/^ //')
127
-
128
-if [[ -z "${reserved_ports}" ]]; then
129
-    $SUDO sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_port}
130
-else
131
-    $SUDO sysctl -w net.ipv4.ip_local_reserved_ports=${keystone_port},${reserved_ports}
132
-fi
133
-
134 120
 # Make swap configuration consistent
135 121
 # TODO: REMOVE ME
136 122
 # https://review.openstack.org/#/c/300122/

Loading…
Cancel
Save