Merge "Fix amulet tests that reference trusty_juno"

This commit is contained in:
Jenkins 2016-12-05 17:36:03 +00:00 committed by Gerrit Code Review
commit c5b42c97cd

View File

@ -604,7 +604,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
'admin_port': '35347',
'public_port': '4990',
}
elif self._get_openstack_release() <= self.trusty_juno:
elif self._get_openstack_release() <= self.trusty_icehouse:
# Juno and earlier
expected['DEFAULT'].update({
'admin_port': '35347',