Skip to content

Commit 043572b

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "v3 endpoint set shouldn't always need service option"
2 parents b5001e4 + a9fb5fa commit 043572b

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎openstackclient/identity/v3/endpoint.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,20 @@ def take_action(self, parsed_args):
181181
identity_client = self.app.client_manager.identity
182182
endpoint = utils.find_resource(identity_client.endpoints,
183183
parsed_args.endpoint)
184-
service = common.find_service(identity_client, parsed_args.service)
185184

186185
if (not parsed_args.interface and not parsed_args.url
187186
and not parsed_args.service and not parsed_args.region):
188187
sys.stdout.write("Endpoint not updated, no arguments present")
189188
return
190189

190+
service_id = None
191+
if parsed_args.service:
192+
service = common.find_service(identity_client, parsed_args.service)
193+
service_id = service.id
194+
191195
identity_client.endpoints.update(
192196
endpoint.id,
193-
service=service.id,
197+
service=service_id,
194198
url=parsed_args.url,
195199
interface=parsed_args.interface,
196200
region=parsed_args.region,

0 commit comments

Comments
 (0)