backport multinode_major_upgrade.yaml environment
This is a squashed commit containing the following changes: I3e3aa5d4fa7e03d1f4483bf42fcff17386b58709 I931534e0ec33e131809186f74068eb479d38a0f9 I41692d2ddb9fbd2002fd7910933ab4edff74f33e I512ad89d9ac82ae62f9cbe7d0029fb1ac7445cc9 I78bd5c804284219a71b13dba21fd1188ca854fca This aligns the stable/newton branch with the current file contents on master/ocata Change-Id: Ie4c67ce232de8086ad1275d80432ef321cdbc573
This commit is contained in:
parent
e4cc922edd
commit
d8b82b0e3f
|
@ -0,0 +1,37 @@
|
||||||
|
heat_template_version: ocata
|
||||||
|
|
||||||
|
description: >
|
||||||
|
OpenStack Core Service
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
ServiceNetMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
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
|
||||||
|
via parameter_defaults in the resource registry.
|
||||||
|
type: json
|
||||||
|
Debug:
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
|
||||||
|
resources:
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role data for the multinode firewall configuration
|
||||||
|
value:
|
||||||
|
service_name: multinode_core
|
||||||
|
config_settings:
|
||||||
|
tripleo.core.firewall_rules:
|
||||||
|
'999 core':
|
||||||
|
proto: 'udp'
|
||||||
|
dport:
|
||||||
|
- 4789
|
|
@ -45,3 +45,4 @@ parameter_defaults:
|
||||||
# Required for Centos 7.3 and Qemu 2.6.0
|
# Required for Centos 7.3 and Qemu 2.6.0
|
||||||
nova::compute::libvirt::libvirt_cpu_mode: 'none'
|
nova::compute::libvirt::libvirt_cpu_mode: 'none'
|
||||||
SwiftCeilometerPipelineEnabled: False
|
SwiftCeilometerPipelineEnabled: False
|
||||||
|
Debug: True
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
|
|
||||||
|
parameter_defaults:
|
||||||
|
ControllerServices:
|
||||||
|
- OS::TripleO::Services::CACerts
|
||||||
|
- OS::TripleO::Services::Kernel
|
||||||
|
- OS::TripleO::Services::Keystone
|
||||||
|
- OS::TripleO::Services::GlanceApi
|
||||||
|
- OS::TripleO::Services::GlanceRegistry
|
||||||
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
- OS::TripleO::Services::NeutronServer
|
||||||
|
- OS::TripleO::Services::NeutronCorePlugin
|
||||||
|
- OS::TripleO::Services::NeutronOvsAgent
|
||||||
|
- OS::TripleO::Services::CinderApi
|
||||||
|
- OS::TripleO::Services::CinderScheduler
|
||||||
|
- OS::TripleO::Services::CinderVolume
|
||||||
|
- OS::TripleO::Services::HeatApi
|
||||||
|
- OS::TripleO::Services::HeatApiCfn
|
||||||
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
|
- OS::TripleO::Services::HeatEngine
|
||||||
|
- OS::TripleO::Services::SwiftProxy
|
||||||
|
- OS::TripleO::Services::SwiftStorage
|
||||||
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
|
- OS::TripleO::Services::SaharaApi
|
||||||
|
- OS::TripleO::Services::SaharaEngine
|
||||||
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::RabbitMQ
|
||||||
|
- OS::TripleO::Services::HAproxy
|
||||||
|
- OS::TripleO::Services::Keepalived
|
||||||
|
- OS::TripleO::Services::Memcached
|
||||||
|
- OS::TripleO::Services::Ntp
|
||||||
|
- OS::TripleO::Services::Timezone
|
||||||
|
- OS::TripleO::Services::TripleoPackages
|
||||||
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
ControllerExtraConfig:
|
||||||
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||||
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||||
|
# Required for Centos 7.3 and Qemu 2.6.0
|
||||||
|
nova::compute::libvirt::libvirt_cpu_mode: 'none'
|
||||||
|
heat::rpc_response_timeout: 600
|
||||||
|
SwiftCeilometerPipelineEnabled: False
|
||||||
|
Debug: True
|
Loading…
Reference in New Issue