Attachment 834796 Details for Bug 1040021 – Fix controller.pp to work with updated pupet modules

[patch] Fix controller.pp to work with updated pupet modules

0001-Fix-controller.pp-to-work-with-updated-pupet-modules.patch (text/plain), 2.08 KB, created by Ryan O'Hara on 2013-12-10 14:37:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan O'Hara

Created: 2013-12-10 14:37:17 UTC

Size: 2.08 KB

patch

obsolete

>From 3cb85acafc5e930fcad4d238b52376322a26fc58 Mon Sep 17 00:00:00 2001
>From: Ryan O'Hara <rohara@redhat.com>
>Date: Tue, 10 Dec 2013 08:30:49 -0600
>Subject: [PATCH] Fix controller.pp to work with updated pupet modules
>
>This patch updates the neutron controller manifest to work with
>updated pupet modules. Specifically, the nova auth setting should now
>be done via nova::api class, not nova_config. Also, the neutron
>database connection should be set via the neutron::server class, not
>neutron_config.
>---
> puppet/modules/quickstack/manifests/neutron/controller.pp | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
>diff --git a/puppet/modules/quickstack/manifests/neutron/controller.pp b/puppet/modules/quickstack/manifests/neutron/controller.pp
>index b0203ce..7c3deff 100644
>--- a/puppet/modules/quickstack/manifests/neutron/controller.pp
>+++ b/puppet/modules/quickstack/manifests/neutron/controller.pp
>@@ -46,13 +46,6 @@ class quickstack::neutron::controller (
>   $verbose                       = $quickstack::params::verbose,
> ) inherits quickstack::params {
> 
>-  nova_config {
>-    'keystone_authtoken/admin_tenant_name': value => 'admin';
>-    'keystone_authtoken/admin_user':        value => 'admin';
>-    'keystone_authtoken/admin_password':    value => $admin_password;
>-    'keystone_authtoken/auth_host':         value => '127.0.0.1';
>-  }
>-
>   class { '::neutron':
>     enabled               => true,
>     verbose               => $verbose,
>@@ -62,13 +55,11 @@ class quickstack::neutron::controller (
>     core_plugin           => $neutron_core_plugin
>   }
> 
>-  neutron_config {
>-    'database/connection': value => "mysql://neutron:${neutron_db_password}@${mysql_host}/neutron";
>-  }
>-
>   class { '::neutron::server':
>     auth_host        => $::ipaddress,
>     auth_password    => $neutron_user_password,
>+    connection       => "mysql://neutron:${neutron_db_password}@${mysql_host}/neutron",
>+    sql_connection   => "mysql://neutron:${neutron_db_password}@${mysql_host}/neutron",
>   }
> 
>   if $neutron_core_plugin == 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2' {
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 1040021: 834796 | 834938