From e53cf26b8f02f912e26ae3996062658524749d98 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Thu, 10 Jul 2014 17:12:11 +0200 Subject: [PATCH] Update puppet-neutron to most recent stable/icehouse Fixes: rhbz#1118010 stackforge/puppet-neutron@d7ea12e Link from ovs config file to plugin.ini on RedHat stackforge/puppet-neutron@0ad1b62 Merge "Configure OVS Agent when using ML2 plugin" into stable/icehouse stackforge/puppet-neutron@10c9606 Configure OVS Agent when using ML2 plugin stackforge/puppet-neutron@5c714a6 Merge "Set default metadata backlog to 4096" into stable/icehouse stackforge/puppet-neutron@d4c7f3b Merge "Add multi-region support" into stable/icehouse stackforge/puppet-neutron@346aa78 Set default metadata backlog to 4096 stackforge/puppet-neutron@29071af Refresh Neutron server stackforge/puppet-neutron@56c5327 Add multi-region support stackforge/puppet-neutron@d91441f Release 4.1.0 stackforge/puppet-neutron@7ec1d59 Merge "Added '' as a valid value for gateway_ip" into stable/icehouse stackforge/puppet-neutron@6513cb6 Added '' as a valid value for gateway_ip stackforge/puppet-neutron@05c13ee Enable neutron server to be run in SSL mode stackforge/puppet-neutron@d6896a6 SSL for communication between neutron and rabbitmq stackforge/puppet-neutron@55ef5b5 Pin neutron gem versions for stable branch stackforge/puppet-neutron@35ca33a Add parameter to set veth MTU Signed-off-by: Gael Chamoulaud --- .gitmodules | 6 +++--- neutron | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index a6b93d802..4778b7a8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "mysql"] path = mysql url = https://github.com/packstack/puppetlabs-mysql.git -[submodule "neutron"] - path = neutron - url = https://github.com/stackforge/puppet-neutron.git [submodule "nova"] path = nova url = https://github.com/stackforge/puppet-nova.git @@ -115,3 +112,6 @@ [submodule "keystone"] path = keystone url = https://github.com/stackforge/puppet-keystone.git +[submodule "neutron"] + path = neutron + url = https://github.com/stackforge/puppet-neutron.git diff --git a/neutron b/neutron index 66c436bc2..d7ea12e36 160000 --- a/neutron +++ b/neutron @@ -1 +1 @@ -Subproject commit 66c436bc2f06c5a71d79c674697394a11ec227f9 +Subproject commit d7ea12e36542204ed737d3514e2f05f2846fd330