Remove NO_SIGNAL from puppet role templates
Currently we use NO_SIGNAL on both the NetworkConfig and subsequent config deploying the data associated with the role. This means there is a risk that should the NetworkConfig do anything interruptive (os-net-config can do interface renaming based on discovery data for example) the role configuration config could fail, and we'd never know until some later error occurs. Additionally, we need to be sure that the heiradata deployed by each of the role specicific configs is actually in-place before proceeding with any of the cluster configuration - atm this works due to the inherent delays involved deploying to bare-metal, but there's still a theoretical race if very fast deployment backends (I'm thinking containers, e.g lxc backend to nova or something) were used instead. Essentially, we should never be using NO_SIGNAL unless we want to ignore failure, which AFAICT is not the case in this instance. Change-Id: I0dbbcc87fb8df8e6bc4775c39fa616b0d0713464
This commit is contained in:
parent
ebb48a23fb
commit
c315681cc8
|
@ -158,6 +158,7 @@ resources:
|
|||
|
||||
BlockStorageDeployment:
|
||||
type: OS::Heat::StructuredDeployment
|
||||
depends_on: NetworkDeployment
|
||||
properties:
|
||||
server: {get_resource: BlockStorage}
|
||||
config: {get_resource: BlockStorageConfig}
|
||||
|
@ -183,7 +184,6 @@ resources:
|
|||
params:
|
||||
server: {get_param: NtpServer}
|
||||
enable_package_install: {get_param: EnablePackageInstall}
|
||||
signal_transport: NO_SIGNAL
|
||||
|
||||
# Map heat metadata into hiera datafiles
|
||||
BlockStorageConfig:
|
||||
|
|
|
@ -304,7 +304,6 @@ resources:
|
|||
NetworkDeployment:
|
||||
type: OS::TripleO::SoftwareDeployment
|
||||
properties:
|
||||
signal_transport: NO_SIGNAL
|
||||
config: {get_resource: NetworkConfig}
|
||||
server: {get_resource: NovaCompute}
|
||||
input_values:
|
||||
|
@ -388,8 +387,8 @@ resources:
|
|||
|
||||
NovaComputeDeployment:
|
||||
type: OS::TripleO::SoftwareDeployment
|
||||
depends_on: NetworkDeployment
|
||||
properties:
|
||||
signal_transport: NO_SIGNAL
|
||||
config: {get_resource: NovaComputeConfig}
|
||||
server: {get_resource: NovaCompute}
|
||||
input_values:
|
||||
|
|
|
@ -495,7 +495,6 @@ resources:
|
|||
NetworkDeployment:
|
||||
type: OS::TripleO::SoftwareDeployment
|
||||
properties:
|
||||
signal_transport: NO_SIGNAL
|
||||
config: {get_resource: NetworkConfig}
|
||||
server: {get_resource: Controller}
|
||||
input_values:
|
||||
|
@ -504,8 +503,8 @@ resources:
|
|||
|
||||
ControllerDeployment:
|
||||
type: OS::TripleO::SoftwareDeployment
|
||||
depends_on: NetworkDeployment
|
||||
properties:
|
||||
signal_transport: NO_SIGNAL
|
||||
config: {get_resource: ControllerConfig}
|
||||
server: {get_resource: Controller}
|
||||
input_values:
|
||||
|
|
|
@ -131,10 +131,10 @@ resources:
|
|||
|
||||
SwiftStorageHieraDeploy:
|
||||
type: OS::Heat::StructuredDeployment
|
||||
depends_on: NetworkDeployment
|
||||
properties:
|
||||
server: {get_resource: SwiftStorage}
|
||||
config: {get_resource: SwiftStorageHieraConfig}
|
||||
signal_transport: NO_SIGNAL
|
||||
input_values:
|
||||
local_ip: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
|
||||
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
|
||||
|
|
Loading…
Reference in New Issue