summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 03:25:34 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 03:25:34 +0000
commit4ef338574b1a7cef8b1b884d439556b24fb09718 (patch)
treed4f1156ebe3fcc613523c977f3aa74aaf8b50571
parent61f31831bdafbbddc7b68606832723fe2516872a (diff)
parentf498ff200ef2c9538abbfeb9beb91c32c08b6ae1 (diff)
Merge "Update neutron ml2 class"
-rw-r--r--puppet/services/neutron-plugin-ml2.yaml2
-rw-r--r--puppet/services/pacemaker/neutron-plugin-ml2.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index 435a6de0..ff13d5d8 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -106,4 +106,4 @@ outputs:
TYPES: {get_param: NeutronNetworkType}
step_config: |
- include ::tripleo::profile::base::neutron::ml2
+ include ::tripleo::profile::base::neutron::plugins::ml2
diff --git a/puppet/services/pacemaker/neutron-plugin-ml2.yaml b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
index ac9d2402..9091b5b9 100644
--- a/puppet/services/pacemaker/neutron-plugin-ml2.yaml
+++ b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
@@ -25,4 +25,4 @@ outputs:
- neutron::agents::ml2::ovs::enabled: false
neutron::agents::ml2::ovs::manage_service: false
step_config: |
- include ::tripleo::profile::pacemaker::neutron::ml2
+ include ::tripleo::profile::pacemaker::neutron::plugins::ml2