"RDO Kilo F22 puppets patches" - Views: 1,116 · Hits: 1,116 - Type: Public

--- ./orig/nova_common_rabbitmq.pp	2015-06-26 12:59:32.493452840 +0300
+++ ./update/nova_common_rabbitmq.pp	2015-06-26 14:49:26.063096306 +0300
@@ -1,9 +1,9 @@
 $private_key = {
-  type => hiera('NOVA_MIGRATION_KEY_TYPE'),
+  'type' => hiera('NOVA_MIGRATION_KEY_TYPE'),
   key  => hiera('NOVA_MIGRATION_KEY_SECRET'),
 }
 $public_key = {
-  type => hiera('NOVA_MIGRATION_KEY_TYPE'),
+  'type' => hiera('NOVA_MIGRATION_KEY_TYPE'),
   key  => hiera('NOVA_MIGRATION_KEY_PUBLIC'),
 }

--- ./orig/swift_storage.pp	2015-06-26 13:01:02.890463722 +0300
+++ ./update/swift_storage.pp	2015-06-26 14:45:59.620501966 +0300
@@ -11,7 +11,7 @@
     ensure  => directory,
     owner   => 'swift',
     group   => 'swift',
-    require => Package['openstack-swift'],
+   require  => Package['swift'],
   }
 }

--- ./orig/provision_demo.pp	2015-06-26 13:02:21.290737783 +0300
+++ ./update/provision_demo.pp	2015-06-26 14:46:23.116341984 +0300
@@ -45,51 +45,6 @@
   ## Neutron
   # IPv6 support is not yet available for public network in packstack.  It can
   # be done manually.  Here we just ensure that we don't fail.
-  if $provision_neutron_avail and $ip_version != 'ipv6' {
-    $neutron_deps = [Neutron_network[$public_network_name]]
-
-    neutron_network { $public_network_name:
-      ensure          => present,
-      router_external => true,
-      tenant_name     => $admin_tenant_name,
-    }
-    neutron_subnet { $public_subnet_name:
-      ensure       => 'present',
-      cidr         => $floating_range,
-      enable_dhcp  => false,
-      network_name => $public_network_name,
-      tenant_name  => $admin_tenant_name,
-    }
-    neutron_network { $private_network_name:
-      ensure      => present,
-      tenant_name => $tenant_name,
-    }
-    neutron_subnet { $private_subnet_name:
-      ensure       => present,
-      cidr         => $fixed_range,
-      network_name => $private_network_name,
-      tenant_name  => $tenant_name,
-    }
-    # Tenant-owned router - assumes network namespace isolation
-    neutron_router { $router_name:
-      ensure               => present,
-      tenant_name          => $tenant_name,
-      gateway_network_name => $public_network_name,
-      # A neutron_router resource must explicitly declare a dependency on
-      # the first subnet of the gateway network.
-      require              => Neutron_subnet[$public_subnet_name],
-    }
-    neutron_router_interface { "${router_name}:${private_subnet_name}":
-      ensure => present,
-    }
-
-    if $setup_ovs_bridge {
-      neutron_l3_ovs_bridge { $public_bridge_name:
-        ensure      => present,
-        subnet_name => $public_subnet_name,
-      }
-    }
-  }
 
 if $setup_ovs_bridge and $ip_version != 'ipv6' {
   firewall { '000 nat':