From 3b62761d2fc25abef4ca98e9d5863197c4497b85 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 17 Aug 2016 09:26:05 -0400 Subject: Add DefaultPasswords to composable services This patch adds a new DefaultPasswords parameter to composable services. This is needed to help provide access to top level password resources that overcloud.yaml currently manages (passwords for Rabbit, Mysql, etc.). Moving the RandomString resources into composable services would cause them to regenerate within the stack. With this approach we can leave them where they are while we deprecate the top level mechanism and move the code that uses the passwords into the composable services. Change-Id: I4f21603c58a169a093962594e860933306879e3f --- puppet/services/time/ntp.yaml | 3 +++ puppet/services/time/timezone.yaml | 3 +++ 2 files changed, 6 insertions(+) (limited to 'puppet/services/time') diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml index bea99b1b..7aa3706f 100644 --- a/puppet/services/time/ntp.yaml +++ b/puppet/services/time/ntp.yaml @@ -13,6 +13,9 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json + DefaultPasswords: + default: {} + type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/puppet/services/time/timezone.yaml b/puppet/services/time/timezone.yaml index 348f6ace..384b5191 100644 --- a/puppet/services/time/timezone.yaml +++ b/puppet/services/time/timezone.yaml @@ -10,6 +10,9 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json + DefaultPasswords: + default: {} + type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set -- cgit 1.2.3-korg