Description of problem:
I am unable to deploy an overcloud using external-swift.yaml to set Swift URLs to my Ceph RGW deployment. The same configuration worked in 16.0

Version-Release number of selected component (if applicable):
16.0.2

How reproducible:
Attempt to deploy an overcloud using the external-swift.yaml environment file on 16.0.2

Steps to Reproduce:
1. Define an overcloud template set with externals-swift.yaml
2. Attempt to run openstack overcloud deploy
3. Observe a failure in processing ControllerServiceChain

Actual results:

Overcloud deployment fails until external-swfit.yaml is removed

Expected results:

Overcloud deployment succeeds with endpoints from external-swift.yaml included in the Keystone catalog

Additional info:

Error during stack creation: ERROR: resources.ControllerServiceChain<https://172.18.101.2:13808/v1/AUTH_eb6422ec626c48f58577453787e846c4/xna-osp1/common/services/controller-role.yaml>.resources.ServiceChain<nested_stack>.resources.51<https://172.18.101.2:13808/v1/AUTH_eb6422ec626c48f58577453787e846c4/xna-osp1/user-files/usr/share/openstack-tripleo-heat-templates/deployment/swift/external-swift-proxy-baremetal-puppet.yaml>.outputs.role_data.value.keystone_resources.swift.endpoints.admin.if: : Invalid condition "deprecated_external_admin_url"
Traceback (most recent call last):

  File "/usr/lib/python3.6/site-packages/heat/engine/template.py", line 373, in parse
    template)

  File "/usr/lib/python3.6/site-packages/heat/engine/function.py", line 175, in __init__
    self.parsed = self.parse_args(parse_func)

  File "/usr/lib/python3.6/site-packages/heat/engine/hot/functions.py", line 1295, in parse_args
    cd = self._get_condition(function.resolve(cond))

  File "/usr/lib/python3.6/site-packages/heat/engine/hot/functions.py", line 1302, in _get_condition
    return self.template.conditions(self.stack).is_enabled(cond)

  File "/usr/lib/python3.6/site-packages/heat/engine/conditions.py", line 61, in is_enabled
    raise ValueError(_('Invalid condition "%s"') % condition_name)

ValueError: Invalid condition "deprecated_external_admin_url"