Merge "Add ec2-api service"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Jan 2017 20:49:56 +0000 (20:49 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Jan 2017 20:49:56 +0000 (20:49 +0000)
1  2 
network/service_net_map.j2.yaml
overcloud-resource-registry-puppet.j2.yaml
roles_data.yaml

Simple merge
diff --cc roles_data.yaml
Simple merge