From baf6eee5016fac7004a7b8be6f78d4505f347aeb Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 22 Jun 2017 17:25:03 +0200 Subject: Adds network/cidr mapping into a new service property Makes it possible to resolve network subnets within a service template; the data is transported into a new property ServiceData wired into every service which hopefully is generic enough to be extended in the future and transport more data. Data can be consumed in service templates to set config values which need to know what is the subnet where a deamon operates (for example the Ceph Public vs Cluster network). Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2 --- docker/services/nova-ironic.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docker/services/nova-ironic.yaml') diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 294293fd..69830466 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -16,6 +16,10 @@ parameters: description: The container image to use for the nova config_volume default: 'centos-binary-nova-base:latest' type: string + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -47,6 +51,7 @@ resources: NovaIronicBase: type: ../../puppet/services/nova-ironic.yaml properties: + ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} -- cgit 1.2.3-korg