diff options
author | 2016-12-20 14:46:54 +0000 | |
---|---|---|
committer | 2016-12-20 14:46:54 +0000 | |
commit | 78f377c16303a2afd6e63f954b822082240abebb (patch) | |
tree | f7370c691127bb59762afb09eecf74abb84560af /puppet/controller-role.yaml | |
parent | c2e00128aa296f19167331d6923e6c9cc9545c05 (diff) | |
parent | c56889100073baa367898093f844e3083fc82f3e (diff) |
Merge "Move UpgradeInitCommand to role templates"
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index a60cc942..5e03adcd 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -138,6 +138,12 @@ parameters: type: string description: Command which will be run whenever configuration data changes default: os-refresh-config --timeout 14400 + UpgradeInitCommand: + type: string + description: | + Command or script snippet to run on all overcloud nodes to + initialize the upgrade process. E.g. a repository switch. + default: '' parameter_groups: - label: deprecated @@ -384,10 +390,30 @@ resources: server: {get_resource: Controller} NodeIndex: {get_param: NodeIndex} + ControllerUpgradeInitConfig: + type: OS::Heat::SoftwareConfig + properties: + group: script + config: + list_join: + - '' + - - "#!/bin/bash\n\n" + - "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n" + - get_param: UpgradeInitCommand + + # Note we may be able to make this conditional on UpgradeInitCommandNotEmpty + # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first + ControllerUpgradeInitDeployment: + type: OS::Heat::SoftwareDeployment + depends_on: NetworkDeployment + properties: + name: ControllerUpgradeInitDeployment + server: {get_resource: Controller} + config: {get_resource: ControllerUpgradeInitConfig} ControllerDeployment: type: OS::TripleO::SoftwareDeployment - depends_on: NetworkDeployment + depends_on: ControllerUpgradeInitDeployment properties: name: ControllerDeployment config: {get_resource: ControllerConfig} |