Merge "Remove Glance Registry service"
authorJenkins <jenkins@review.openstack.org>
Wed, 18 Jan 2017 00:05:11 +0000 (00:05 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 18 Jan 2017 00:05:11 +0000 (00:05 +0000)
13 files changed:
1  2 
ci/environments/scenario001-multinode.yaml
ci/environments/scenario002-multinode.yaml
ci/environments/scenario003-multinode.yaml
ci/environments/scenario004-multinode.yaml
deployed-server/deployed-server-roles-data.yaml
environments/tls-endpoints-public-dns.yaml
environments/tls-endpoints-public-ip.yaml
environments/tls-everywhere-endpoints-dns.yaml
network/endpoints/endpoint_data.yaml
network/endpoints/endpoint_map.yaml
overcloud-resource-registry-puppet.j2.yaml
roles_data.yaml
roles_data_undercloud.yaml

Simple merge
Simple merge
diff --cc roles_data.yaml
Simple merge
Simple merge