diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-03 01:48:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-03 01:48:27 +0000 |
| commit | 9df1c376846218a0869d32e5bf4e9270a0a8a4da (patch) | |
| tree | 5dc130fb9b2fbe6dfe1edbb91e53ab49981b4baf /environments | |
| parent | 5e871e70fec12325e62ef40733063c0c57432e03 (diff) | |
| parent | ee2c065be70f03a9f36f3183813d542642c63908 (diff) | |
Merge "Add support for linuxbridge agent"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/hyperconverged-ceph.yaml | 1 | ||||
| -rw-r--r-- | environments/neutron-linuxbridge.yaml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 6fd71013..0f7e1143 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -19,6 +19,7 @@ parameter_defaults: - OS::TripleO::Services::Kernel - OS::TripleO::Services::ComputeNeutronCorePlugin - OS::TripleO::Services::ComputeNeutronOvsAgent + - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent diff --git a/environments/neutron-linuxbridge.yaml b/environments/neutron-linuxbridge.yaml new file mode 100644 index 00000000..c8045cc9 --- /dev/null +++ b/environments/neutron-linuxbridge.yaml @@ -0,0 +1,8 @@ +## A Heat environment that can be used to deploy linuxbridge +resource_registry: + OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::NeutronLinuxbridgeAgent: ../puppet/services/neutron-linuxbridge-agent.yaml + +parameter_defaults: + NeutronMechanismDrivers: ['linuxbridge'] |