Remove docker references from stable/ocata scenarios.
The container scenarios referenced dockerized services, which doesn't make sense in Ocata. In Ocata, these scenarios should be normal puppet deployments, but without HA, until we start CI-ing HA upgrades. Change-Id: I29675e304ed0e7cd7d666570d9af30ad95ba7caf Closes-Bug: #1708014
This commit is contained in:
parent
564e3feeb9
commit
14406f8f7c
|
@ -1,35 +1,19 @@
|
|||
# NOTE: This is an environment specific for containers CI. Mainly we
|
||||
# deploy non-pacemakerized overcloud. Once we are able to deploy and
|
||||
# upgrade pacemakerized and containerized overcloud, we should remove
|
||||
# this file and use normal CI multinode environments/scenarios.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
# TODO deploy ceph with ceph-ansible: https://review.openstack.org/#/c/465066/
|
||||
OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml
|
||||
OS::TripleO::Services::CephClient: ../../puppet/services/ceph-client.yaml
|
||||
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
|
||||
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
|
||||
OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
|
||||
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
|
||||
# TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/
|
||||
OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
|
||||
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
|
||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||
# deploy the initial environment with Ocata templates, and
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
# mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can
|
||||
# remove this.
|
||||
OS::TripleO::Services::Docker: OS::Heat::None
|
||||
OS::TripleO::Services::PankoApi: ../../puppet/services/panko-api.yaml
|
||||
OS::TripleO::Services::Collectd: ../../puppet/services/metrics/collectd.yaml
|
||||
OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml
|
||||
OS::TripleO::Services::Congress: ../../puppet/services/congress.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
- OS::TripleO::Services::Docker
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::Keystone
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
|
@ -58,7 +42,6 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::Ntp
|
||||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::Sshd
|
||||
- OS::TripleO::Services::Securetty
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::NovaCompute
|
||||
- OS::TripleO::Services::NovaLibvirt
|
||||
|
@ -68,8 +51,10 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::AodhEvaluator
|
||||
- OS::TripleO::Services::AodhNotifier
|
||||
- OS::TripleO::Services::AodhListener
|
||||
- OS::TripleO::Services::CeilometerApi
|
||||
- OS::TripleO::Services::CeilometerCollector
|
||||
- OS::TripleO::Services::CeilometerExpirer
|
||||
- OS::TripleO::Services::CeilometerAgentCentral
|
||||
- OS::TripleO::Services::CeilometerAgentIpmi
|
||||
- OS::TripleO::Services::CeilometerAgentNotification
|
||||
- OS::TripleO::Services::GnocchiApi
|
||||
- OS::TripleO::Services::GnocchiMetricd
|
||||
|
@ -87,9 +72,6 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::Congress
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
- OS::TripleO::Services::FluentdClient
|
||||
- OS::TripleO::Services::SensuClient
|
||||
|
||||
ControllerExtraConfig:
|
||||
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||
|
@ -123,17 +105,3 @@ parameter_defaults:
|
|||
******************************************************************
|
||||
CollectdExtraPlugins:
|
||||
- rrdtool
|
||||
LoggingServers:
|
||||
- host: 127.0.0.1
|
||||
port: 24224
|
||||
MonitoringRabbitHost: 127.0.0.1
|
||||
MonitoringRabbitPort: 5676
|
||||
MonitoringRabbitPassword: sensu
|
||||
TtyValues:
|
||||
- console
|
||||
- tty1
|
||||
- tty2
|
||||
- tty3
|
||||
- tty4
|
||||
- tty5
|
||||
- tty6
|
||||
|
|
|
@ -1,28 +1,15 @@
|
|||
# NOTE: This is an environment specific for containers CI. Mainly we
|
||||
# deploy non-pacemakerized overcloud. Once we are able to deploy and
|
||||
# upgrade pacemakerized and containerized overcloud, we should remove
|
||||
# this file and use normal CI multinode environments/scenarios.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
# TODO: Barbican is not yet containerized: https://review.openstack.org/#/c/474327
|
||||
# OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml
|
||||
OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml
|
||||
OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
|
||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||
# deploy the initial environment with Ocata templates, and
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
# mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can
|
||||
# remove this.
|
||||
OS::TripleO::Services::Docker: OS::Heat::None
|
||||
OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
|
||||
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
|
||||
OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
- OS::TripleO::Services::Docker
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::Keystone
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
|
|
|
@ -1,29 +1,17 @@
|
|||
# NOTE: This is an environment specific for containers CI. Mainly we
|
||||
# deploy non-pacemakerized overcloud. Once we are able to deploy and
|
||||
# upgrade pacemakerized and containerized overcloud, we should remove
|
||||
# this file and use normal CI multinode environments/scenarios.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
|
||||
OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml
|
||||
OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
|
||||
OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
|
||||
OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml
|
||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||
# deploy the initial environment with Ocata templates, and
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
# mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can
|
||||
# remove this.
|
||||
OS::TripleO::Services::Docker: OS::Heat::None
|
||||
OS::TripleO::Services::SaharaApi: ../../puppet/services/sahara-api.yaml
|
||||
OS::TripleO::Services::SaharaEngine: ../../puppet/services/sahara-engine.yaml
|
||||
OS::TripleO::Services::MistralApi: ../../puppet/services/mistral-api.yaml
|
||||
OS::TripleO::Services::MistralEngine: ../../puppet/services/mistral-engine.yaml
|
||||
OS::TripleO::Services::MistralExecutor: ../../puppet/services/mistral-executor.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
- OS::TripleO::Services::Docker
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::Keystone
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
# NOTE: This is an environment specific for containers CI. Mainly we
|
||||
# deploy non-pacemakerized overcloud. Once we are able to deploy and
|
||||
# upgrade pacemakerized and containerized overcloud, we should remove
|
||||
# this file and use normal CI multinode environments/scenarios.
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
# TODO deploy ceph with ceph-ansible: https://review.openstack.org/#/c/465066/
|
||||
OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml
|
||||
OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml
|
||||
|
@ -14,19 +8,10 @@ resource_registry:
|
|||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml
|
||||
OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml
|
||||
# NOTE: being containerized here: https://review.openstack.org/#/c/471527/
|
||||
OS::TripleO::Services::ManilaApi: ../../puppet/services/manila-api.yaml
|
||||
OS::TripleO::Services::ManilaScheduler: ../../puppet/services/manila-scheduler.yaml
|
||||
OS::TripleO::Services::ManilaShare: ../../puppet/services/manila-share.yaml
|
||||
OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
|
||||
# TODO: containerize NeutronBgpVpnApi
|
||||
OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml
|
||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||
# deploy the initial environment with Ocata templates, and
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
# mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can
|
||||
# remove this.
|
||||
OS::TripleO::Services::Docker: OS::Heat::None
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
@ -38,7 +23,6 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::CephMon
|
||||
- OS::TripleO::Services::CephOSD
|
||||
- OS::TripleO::Services::CephRgw
|
||||
- OS::TripleO::Services::Docker
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::Keystone
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
|
@ -48,7 +32,6 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::HeatEngine
|
||||
- OS::TripleO::Services::MySQL
|
||||
- OS::TripleO::Services::MySQLClient
|
||||
- OS::TripleO::Services::NeutronBgpVpnApi
|
||||
- OS::TripleO::Services::NeutronDhcpAgent
|
||||
- OS::TripleO::Services::NeutronL3Agent
|
||||
- OS::TripleO::Services::NeutronMetadataAgent
|
||||
|
@ -94,5 +77,3 @@ parameter_defaults:
|
|||
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
|
||||
SwiftCeilometerPipelineEnabled: false
|
||||
NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
|
||||
BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
|
||||
|
|
Loading…
Reference in New Issue