|
1 This upstream patch addresses Launchpad bug 1244304. Although it's been |
|
2 addressed in Icehouse 2014.1, the patch below is still not yet released |
|
3 for Havana. |
|
4 |
|
5 commit 380894fa4a9329c963fad7dbd17fd9b94b1918a8 |
|
6 Author: Kun Huang <[email protected]> |
|
7 Date: Fri Oct 25 00:26:43 2013 +0800 |
|
8 |
|
9 remove 8888 port in sample_data.sh |
|
10 |
|
11 Swift now doesn't use 8888 port as any default service. And the origin |
|
12 sample_data.sh always let new users to fail and modify swift bind port. |
|
13 So switching 8888 port here to 8080 could generate sample data without |
|
14 any change for building swift + keystone environment. |
|
15 |
|
16 Closes-Bug: #1244304 |
|
17 Change-Id: If58f9f025f57565733aa25efc2fdf06865781391 |
|
18 |
|
19 diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/test_token_provider.py |
|
20 index c93bd73..8b2c212 100644 |
|
21 --- a/keystone/tests/test_token_provider.py |
|
22 +++ b/keystone/tests/test_token_provider.py |
|
23 @@ -92,10 +92,10 @@ SAMPLE_V2_TOKEN = { |
|
24 { |
|
25 "endpoints": [ |
|
26 { |
|
27 - "adminURL": "http://localhost:8888/v1", |
|
28 + "adminURL": "http://localhost:8080/v1", |
|
29 "id": "7bd0c643e05a4a2ab40902b2fa0dd4e6", |
|
30 - "internalURL": "http://localhost:8888/v1/AUTH_01257", |
|
31 - "publicURL": "http://localhost:8888/v1/AUTH_01257", |
|
32 + "internalURL": "http://localhost:8080/v1/AUTH_01257", |
|
33 + "publicURL": "http://localhost:8080/v1/AUTH_01257", |
|
34 "region": "RegionOne" |
|
35 } |
|
36 ], |
|
37 @@ -202,19 +202,19 @@ SAMPLE_V3_TOKEN = { |
|
38 "id": "7bd0c643e05a4a2ab40902b2fa0dd4e6", |
|
39 "interface": "admin", |
|
40 "region": "RegionOne", |
|
41 - "url": "http://localhost:8888/v1" |
|
42 + "url": "http://localhost:8080/v1" |
|
43 }, |
|
44 { |
|
45 "id": "43bef154594d4ccb8e49014d20624e1d", |
|
46 "interface": "internal", |
|
47 "region": "RegionOne", |
|
48 - "url": "http://localhost:8888/v1/AUTH_01257" |
|
49 + "url": "http://localhost:8080/v1/AUTH_01257" |
|
50 }, |
|
51 { |
|
52 "id": "e63b5f5d7aa3493690189d0ff843b9b3", |
|
53 "interface": "public", |
|
54 "region": "RegionOne", |
|
55 - "url": "http://localhost:8888/v1/AUTH_01257" |
|
56 + "url": "http://localhost:8080/v1/AUTH_01257" |
|
57 } |
|
58 ], |
|
59 "id": "a669e152f1104810a4b6701aade721bb", |
|
60 @@ -399,10 +399,10 @@ SAMPLE_V2_TOKEN_WITH_EMBEDED_VERSION = { |
|
61 { |
|
62 "endpoints": [ |
|
63 { |
|
64 - "adminURL": "http://localhost:8888/v1", |
|
65 + "adminURL": "http://localhost:8080/v1", |
|
66 "id": "7bd0c643e05a4a2ab40902b2fa0dd4e6", |
|
67 - "internalURL": "http://localhost:8888/v1/AUTH_01257", |
|
68 - "publicURL": "http://localhost:8888/v1/AUTH_01257", |
|
69 + "internalURL": "http://localhost:8080/v1/AUTH_01257", |
|
70 + "publicURL": "http://localhost:8080/v1/AUTH_01257", |
|
71 "region": "RegionOne" |
|
72 } |
|
73 ], |
|
74 @@ -509,19 +509,19 @@ SAMPLE_V3_TOKEN_WITH_EMBEDED_VERSION = { |
|
75 "id": "7bd0c643e05a4a2ab40902b2fa0dd4e6", |
|
76 "interface": "admin", |
|
77 "region": "RegionOne", |
|
78 - "url": "http://localhost:8888/v1" |
|
79 + "url": "http://localhost:8080/v1" |
|
80 }, |
|
81 { |
|
82 "id": "43bef154594d4ccb8e49014d20624e1d", |
|
83 "interface": "internal", |
|
84 "region": "RegionOne", |
|
85 - "url": "http://localhost:8888/v1/AUTH_01257" |
|
86 + "url": "http://localhost:8080/v1/AUTH_01257" |
|
87 }, |
|
88 { |
|
89 "id": "e63b5f5d7aa3493690189d0ff843b9b3", |
|
90 "interface": "public", |
|
91 "region": "RegionOne", |
|
92 - "url": "http://localhost:8888/v1/AUTH_01257" |
|
93 + "url": "http://localhost:8080/v1/AUTH_01257" |
|
94 } |
|
95 ], |
|
96 "id": "a669e152f1104810a4b6701aade721bb", |
|
97 diff --git a/tools/sample_data.sh b/tools/sample_data.sh |
|
98 index d09502d..65030b5 100755 |
|
99 --- a/tools/sample_data.sh |
|
100 +++ b/tools/sample_data.sh |
|
101 @@ -215,9 +215,9 @@ keystone service-create --name=swift \ |
|
102 --description="Swift Service") |
|
103 if [[ -z "$DISABLE_ENDPOINTS" ]]; then |
|
104 keystone endpoint-create --region RegionOne --service-id $SWIFT_SERVICE \ |
|
105 - --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8888/v1/AUTH_\$(tenant_id)s" \ |
|
106 - --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8888/v1" \ |
|
107 - --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8888/v1/AUTH_\$(tenant_id)s" |
|
108 + --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8080/v1/AUTH_\$(tenant_id)s" \ |
|
109 + --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8080/v1" \ |
|
110 + --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8080/v1/AUTH_\$(tenant_id)s" |
|
111 fi |
|
112 |
|
113 # create ec2 creds and parse the secret and access key returned |