EC2 + Keystone client missing attributes

When trying to use eucarc (https://github.com/openstack-dev/devstack/blob/master/eucarc) or the devstackPY copy called euca.sh ( https://github.com/yahoo/Openstack-DevstackPy/blob/master/euca.sh )

I am getting the following:

++ keystone catalog --service ec2
++ awk '/ publicURL / { print $4 }'
'Client' object has no attribute 'service_catalog'
+ export EC2_URL=
+ EC2_URL=
++ keystone ec2-credentials-create
'Client' object has no attribute 'auth_tenant_id'
+ CREDS=
++ echo ''
++ awk '/ access / { print $4 }'
+ export EC2_ACCESS_KEY=
+ EC2_ACCESS_KEY=
++ echo ''
++ awk '/ secret / { print $4 }'
+ export EC2_SECRET_KEY=
+ EC2_SECRET_KEY=
+ NOVA_KEY_DIR=
++ keystone catalog --service s3
++ awk '/ publicURL / { print $4 }'
'Client' object has no attribute 'service_catalog'

This seems to stop EC2 from being useable by euca tools and the like (since we can't register the service or get keys out)