summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-08-12 17:31:58 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-08-30 12:51:50 +0200
commit10a24b2faac9d7b9ceb45ba9100625f3937c7a66 (patch)
tree938eeb27fa5ae1de1ac45e57d344ca14e0d323c8 /network
parent4c6a101511da96c8d1170c774e52ea8fd2046458 (diff)
Move ceph cluster config out of allNodesConfig
Pass the list of ceph nodes to the ceph_mon profile via the service template - this requires some fixup to the profile to handle the ipv6 case. Note this also aligns the ServiceNetMap keys so that the composable node_ips logic will generate the lists when the ceph_mon service is enabled. Change-Id: If8a5c65f17e677fe62243b3aa746fd642f72d2b0 Depends-On: I481dd2cd2cde7f1491080e6d9c7dcb7047c22de1 Partially-Implements: blueprint custom-roles
Diffstat (limited to 'network')
-rw-r--r--network/service_net_map.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/network/service_net_map.yaml b/network/service_net_map.yaml
index 50f5c55a..fa63b09c 100644
--- a/network/service_net_map.yaml
+++ b/network/service_net_map.yaml
@@ -40,7 +40,7 @@ parameters:
RedisNetwork: internal_api
MysqlNetwork: internal_api
CephClusterNetwork: storage_mgmt
- CephPublicNetwork: storage
+ CephMonNetwork: storage
ControllerHostnameResolveNetwork: internal_api
ComputeHostnameResolveNetwork: internal_api
BlockStorageHostnameResolveNetwork: internal_api
@@ -58,6 +58,7 @@ parameters:
default:
MongoDbNetwork: MongodbNetwork
RabbitMqNetwork: RabbitmqNetwork
+ CephPublicNetwork: CephMonNetwork
description: Mapping older deprecated service names, intended for
internal use only, this will be removed in future.
type: json