diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-17 12:39:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-17 12:39:12 +0000 |
| commit | 6d0cec55ce50a54ede405c465f26fe87bb68af4e (patch) | |
| tree | c1b668dd32cbd0bc977e39974bdcfcd5ab630fa7 /puppet/controller-puppet.yaml | |
| parent | d65027bd4a676e046157ba2729866166b9d6a584 (diff) | |
| parent | e78e1c8d9b5a7ebf327987b22091bff3ed42d1c1 (diff) | |
Merge "Big Switch Neutron ML2 plugin integration"
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index f47463ab..eb19b36d 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -910,6 +910,7 @@ resources: - '"%{::osfamily}"' - common - cinder_netapp_data # Optionally provided by ControllerExtraConfigPre + - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre datafiles: controller_extraconfig: |