diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/disable-telemetry.yaml | 3 | ||||
| -rw-r--r-- | environments/docker-centos-tripleoupstream.yaml | 7 | ||||
| -rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 15 | ||||
| -rw-r--r-- | environments/docker.yaml | 15 | ||||
| -rw-r--r-- | environments/neutron-ml2-bigswitch.yaml | 1 |
5 files changed, 10 insertions, 31 deletions
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml index 6249c286..52d0d27b 100644 --- a/environments/disable-telemetry.yaml +++ b/environments/disable-telemetry.yaml @@ -18,3 +18,6 @@ resource_registry: OS::TripleO::Services::AodhNotifier: OS::Heat::None OS::TripleO::Services::AodhListener: OS::Heat::None OS::TripleO::Services::PankoApi: OS::Heat::None + +parameter_defaults: + NotificationDriver: 'noop' diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml index 648c8c26..9eb45363 100644 --- a/environments/docker-centos-tripleoupstream.yaml +++ b/environments/docker-centos-tripleoupstream.yaml @@ -1,4 +1,11 @@ parameter_defaults: + # FIXME: Remove this when we uncomment at least one parameter in this file. + # It seems an environment file with empty parameter_defaults section has the + # potential to confuse Heat in a way that it doesn't deploy a single service + # on the overcloud in the multinode job. + # https://bugs.launchpad.net/tripleo/+bug/1703599 + PlaceholderParameter: can be removed when we add a different param to this env file + #DockerAodhApiImage: 'tripleoupstream/centos-binary-aodh-api:latest' #DockerAodhConfigImage: 'tripleoupstream/centos-binary-aodh-api:latest' #DockerAodhEvaluatorImage: 'tripleoupstream/centos-binary-aodh-evaluator:latest' diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 3ca04697..8d304494 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -34,18 +34,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Sshd diff --git a/environments/docker.yaml b/environments/docker.yaml index c32001a7..52b2dc05 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -63,18 +63,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::CeilometerAgentCompute - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::OpenDaylightOvs diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml index 8a4a144c..c0ba906e 100644 --- a/environments/neutron-ml2-bigswitch.yaml +++ b/environments/neutron-ml2-bigswitch.yaml @@ -13,7 +13,6 @@ parameter_defaults: NeutronBigswitchRestproxyServerAuth: NeutronMechanismDrivers: openvswitch,bsn_ml2 NeutronServicePlugins: bsn_l3,bsn_service_plugin - KeystoneNotificationDriver: messaging # Optional: # NeutronBigswitchRestproxyAutoSyncOnFailure: |