Merge branch 'mitaka_dev' into 'master'

Mitaka dev

See merge request !33

manifests/params.pp

@@ -73,8 +73,6 @@ $os_neutron_servicepl 	= ['router', 'lbaas', 'vpnaas', 'firewall', 'metering'],
 
 ##Nova
 $os_nova_passwd 	= 'nova',
-#present in mitaka release
-#$os_nova_fpool 		= 'ext-net',
 
 ##Ceilometer
 $os_ceilometer_passwd 	= 'ceilometer',

manifests/profile/ceilometer/common.pp

@@ -45,13 +45,4 @@ class iaas::profile::ceilometer::common (
     auth_region => $region,
   }
 
-##Identity_uri - workaround in juno
-#  ceilometer_config {
-#    'keystone_authtoken/identity_uri' :value => "http://${real_endpoint_admin}:35357";
-#  }
-
-## Change default polling interval from 10min to 0.5m for all sources
-#  exec { 'ceilometer_pipeline_interval':
-#    command => "sed -i 's/interval: 600$/interval: 30/' /etc/ceilometer/pipeline.yaml",
-#  }
 }

manifests/profile/ceilometer/controller.pp

@@ -34,10 +34,6 @@ class iaas::profile::ceilometer::controller (
 
   class { '::ceilometer::keystone::auth':
     password => $password,
-#not in mitaka
-#    public_address => $endpoint_main,
-#    admin_address => $real_endpoint_admin,
-#    internal_address => $real_endpoint_admin,
     public_url => "http://${endpoint_main}:8777",
     admin_url => "http://${real_endpoint_admin}:8777",
     internal_url => "http://${real_endpoint_admin}:8777",
@@ -45,25 +41,15 @@ class iaas::profile::ceilometer::controller (
   }
 
   class { '::ceilometer::api':
-#dep in mitaka
-#    keystone_host => $real_endpoint_admin,
-#mitaka
     host => $::facts["ipaddress_${admin_interface}"],
     enabled => true,
     keystone_password => $password,
-#dep in mitaka
-#    keystone_auth_uri => "http://${endpoint_main}:5000/v2.0",
-#    keystone_identity_uri => "http://${real_endpoint_admin}:35357",
-#mitaka
     auth_uri => "http://${endpoint_main}:5000/",
     identity_uri => "http://${real_endpoint_admin}:35357/",
   }
 
   class { '::ceilometer::db':
     database_connection => $iaas::resources::connectors::ceilometer,
-#dep mitaka
-#    mysql_module => '2.3',
-#mitaka
     database_idle_timeout => 3600,
   }
 
@@ -90,15 +76,6 @@ class iaas::profile::ceilometer::controller (
     coordination_url => "kazoo://${$real_coordination_ip}",
   }
 
-#dep mitaka
-#  class { '::ceilometer::alarm::evaluator':
-#    coordination_url => "kazoo://${$real_coordination_ip}",
-#  }
-
-#mitaka
-#  class { '::ceilometer::expirer':
-#    time_to_live => '2592000',
-#  }
   class { '::ceilometer::expirer': }
 
   class { '::ceilometer::alarm::notifier': }

manifests/profile/cinder.pp

@@ -46,8 +46,6 @@ class iaas::profile::cinder (
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
     rabbit_virtual_host => '/',
-#not in mitaka
-#    mysql_module => '2.3',
     database_idle_timeout => 3600,
   }
 
@@ -57,11 +55,6 @@ class iaas::profile::cinder (
 
   class { '::cinder::keystone::auth':
     password => $password,
-#not in mitaka
-#    public_address => $endpoint_main,
-#    admin_address => $real_endpoint_admin,
-#    internal_address => $real_endpoint_admin,
-#mitaka
     public_url => "http://${endpoint_main}:8776/v1/%(tenant_id)s",
     internal_url => "http://${real_endpoint_admin}:8776/v1/%(tenant_id)s",
     admin_url => "http://${real_endpoint_admin}:8776/v1/%(tenant_id)s",
@@ -75,12 +68,6 @@ class iaas::profile::cinder (
   }
 
   class { '::cinder::api':
-#Identity_uri - planed to be implemented in Kilo
-#not in mitaka
-#    keystone_identity_uri => "http://${real_endpoint_admin}:35357",
-#    keystone_auth_uri => "http://${endpoint_main}:5000/v2.0",
-#    keystone_auth_host => $real_endpoint_admin,
-#mitaka
     identity_uri => "http://${real_endpoint_admin}:35357",
     auth_uri => "http://${endpoint_main}:5000",
     keystone_password => $password,
@@ -105,9 +92,4 @@ class iaas::profile::cinder (
     backup_ceph_user => 'cinder-backup',
   }
 
-#JUNO release
-#  cinder_config {
-#    'keystone_authtoken/identity_uri' :value => "http://${real_endpoint_admin}:35357";
-#  }
-
 }

manifests/profile/glance.pp

@@ -35,8 +35,6 @@ class iaas::profile::glance (
 
   $rabbits = suffix($rhosts, ':5672')
 
-#  class { 'ceph::profile::client': } ->
-#  class { 'ceph::keys': } ->
 
   class { '::glance::api':
 ##verbose, debug
@@ -45,20 +43,14 @@ class iaas::profile::glance (
 ##Identity_uri - planed to be implemented in Kilo
     identity_uri => "http://${real_endpoint_admin}:35357",
     bind_host => $::facts["ipaddress_${admin_interface}"],
-#not present in mitaka
-#    auth_host => $real_endpoint_admin,
     keystone_password => $password,
     auth_uri => "http://${endpoint_main}:5000/v2.0",
     keystone_tenant => 'services',
     keystone_user => 'glance',
-#not present in mitaka
-#    auth_url => "http://${endpoint_main}:5000/v2.0",
     database_connection => $iaas::resources::connectors::glance,
 ##registry_host
 #    registry_host => $real_endpoint_admin,
     registry_host => $::facts["ipaddress_${admin_interface}"],
-#not present in mitaka
-#    mysql_module => '2.3',
     database_idle_timeout => 3600,
     os_region_name => $region,
 #deprecated in newton
@@ -91,16 +83,11 @@ class iaas::profile::glance (
     identity_uri => "http://${real_endpoint_admin}:35357",
     keystone_password => $password,
     database_connection => $iaas::resources::connectors::glance,
-# not present in mitaka
-#    auth_host => $real_endpoint_admin,
     auth_uri => "http://${endpoint_main}:5000/v2.0",
     keystone_tenant => 'services',
     keystone_user => 'glance',
-#not present in mitaka
-#    mysql_module => '2.3',
     database_idle_timeout => 3600,
     bind_host => $::facts["ipaddress_${admin_interface}"],
-#mitaka
     os_region_name => $region,
     pipeline => 'keystone',
 #mitaka, memcache
@@ -128,11 +115,6 @@ class iaas::profile::glance (
 
   class  { '::glance::keystone::auth':
     password => $password,
-#not in mitaka
-#    public_address => $endpoint_main,
-#    admin_address => $real_endpoint_admin,
-#    internal_address => $real_endpoint_admin,
-#mitaka
     public_url => "http://${endpoint_main}:9292",
     admin_url => "http://${real_endpoint_admin}:9292",
     internal_url => "http://${real_endpoint_admin}:9292",

manifests/profile/keystone.pp

@@ -51,8 +51,6 @@ class iaas::profile::keystone (
     rabbit_hosts => suffix($rhosts, ':5672'),
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
-#not present in mitaka
-#    mysql_module => '2.3',
     database_idle_timeout => 3600,
   }
 
@@ -71,7 +69,7 @@ class iaas::profile::keystone (
     admin_url => "http://${real_endpoint_admin}:35357",
     internal_url => "http://${real_endpoint_admin}:5000",
     region => $region,
-#mitaka, efaults to 'v2.0' if unset by user; Valid values are 'v2.0', 'v3'
+#mitaka, defaults to 'v2.0' if unset by user; Valid values are 'v2.0', 'v3'
     version => 'v3',
   }
 

manifests/profile/neutron/client.pp

@@ -18,8 +18,6 @@ class iaas::profile::neutron::client (
       local_ip         => $::facts["ipaddress_${data_interface}"],
       enabled          => true,
       tunnel_types     => ['gre'],
-#dep mitaka
-#      require => File['etc_default_neutron-server'],
     } 
 
 #Mitaka, start br-* interfaces

manifests/profile/neutron/common.pp

@@ -21,11 +21,9 @@ class iaas::profile::neutron::common (
   $mtu = $iaas::params::mtu,
 ) {
 
-#dep mitaka
-#  file { 'etc_default_neutron-server':
-#    path => '/etc/default/neutron-server',
-#    ensure => 'present'
-#  }
+  file { "/etc/init/neutron-l3-agent.conf":
+    ensure => 'present',
+  }
 
   class { '::neutron':
 ##added verbose, debug
@@ -41,7 +39,6 @@ class iaas::profile::neutron::common (
     rabbit_hosts => suffix($rhosts, ':5672'),
     rabbit_user => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
-#mitaka
     rabbit_virtual_host => '/',
     service_plugins => $service_plugins,
     dhcp_agents_per_network => 2

manifests/profile/neutron/router.pp

@@ -26,9 +26,6 @@ class iaas::profile::neutron::router (
 #Mitaka NEW
   $dnsmasq_servers = undef,
 
-#dep Mitaka
-#  $mtu = '1438',
-
 ) {
 
   if $endpoint_admin == '' {
@@ -53,8 +50,6 @@ class iaas::profile::neutron::router (
   include iaas::resources::connectors
 
   class { '::neutron::server':
-#dep mitaka
-#    auth_host => $real_endpoint_admin,
     auth_uri => "http://${endpoint_main}:5000/",
     auth_url => "http://${real_endpoint_admin}:35357/",
     password => $neutron_password,
@@ -62,35 +57,23 @@ class iaas::profile::neutron::router (
     package_ensure => 'present',
     enabled => false,
     sync_db => false,
-#    mysql_module => '2.3',
     database_idle_timeout => 3600,
     l3_ha => false,
     manage_service => 'false',
-#mitaka
    region_name => $region,
   }
 
-##Set L3 Agent
-#dep mitaka???
-#  file { "/etc/init/neutron-l3-agent.conf":
-#    ensure => 'present',
-#  } ->
   class { '::neutron::agents::l3':
 #double_external_network
 #    external_network_bridge => 'br-ex',
-#dep mitaka
-#    external_network_bridge => ' ',
-#    use_namespaces => true,
-#    router_delete_namespaces => true,
     ha_enabled => true,
     enabled => false,
     package_ensure => 'absent',
     manage_service => 'false',
+    external_network_bridge => ' ',
   }
 
   class { '::neutron::agents::dhcp':
-#dep mitaka
-#    dhcp_delete_namespaces => true,
     enable_isolated_metadata => true,
     enable_metadata_network => true,
 #mitaka
@@ -99,13 +82,6 @@ class iaas::profile::neutron::router (
 #    dnsmasq_dns_servers => '131.154.3.1,131.154.1.3',
     dnsmasq_dns_servers => join(any2array($dnsmasq_servers), ','),
   }
-#dep Mitaka
-#  file { '/etc/neutron/dnsmasq-neutron.conf':
-#    owner => root,
-#    group => root,
-#    mode  => 644,
-#    content => "dhcp-option-force=26,${mtu}"
-#  }
 
   class { '::neutron::agents::vpnaas':
 #double_external_network
@@ -119,10 +95,6 @@ class iaas::profile::neutron::router (
 #  }
 
   class { '::neutron::agents::metadata':
-#dep mitaka
-#    auth_password => $neutron_password,
-#    auth_url => "http://${endpoint_main}:5000/v2.0",
-#    auth_region => $region, 
     shared_secret => $neutron_secret,
     metadata_ip => $real_endpoint_admin,
     metadata_port => '8775', 
@@ -155,8 +127,12 @@ class iaas::profile::neutron::router (
 #double_external_network, variable modified
 #      bridge_mappings => ['external:br-ex'],
       bridge_mappings => $bridge_mappings,
-#dep mitaka
-#      require => File['etc_default_neutron-server'],
+  }
+
+#FWAAS support for Network node
+  class {'::neutron::services::fwaas':
+    enabled => true,
+    driver => 'neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver',
   }
 
 # Set public network if $public_interface != $external_device1

manifests/profile/neutron/routeroncontroller.pp

@@ -26,9 +26,6 @@ class iaas::profile::neutron::routeroncontroller (
 #Mitaka NEW
   $dnsmasq_servers = undef,
 
-#dep  mitaka
-#  $mtu = '1438',
-
 ) {
 
   if $endpoint_admin == '' {
@@ -48,44 +45,14 @@ class iaas::profile::neutron::routeroncontroller (
 
   package { 'ifupdown-extra': }
 
-##Set L3 Agent
-#dep mitaka???
-#  file { "/etc/init/neutron-l3-agent.conf":
-#    ensure => 'present',
-#  } 
-  class { '::neutron::agents::l3':
-#double_external_network
-#    external_network_bridge => 'br-ex',
-#dep mitaka
-#    external_network_bridge => ' ',
-#    use_namespaces => true,
-#    router_delete_namespaces => true,
-    ha_enabled => true,
-    enabled => false,
-    package_ensure => 'absent',
-    manage_service => 'false',
-    external_network_bridge => ' ',
-  }
-
   class { '::neutron::agents::dhcp':
-#dep mitaka
-#    dhcp_delete_namespaces => true,
     enable_isolated_metadata => true,
     enable_metadata_network => true,
-#nomitaka
-#    dnsmasq_config_file => "/etc/neutron/dnsmasq-neutron.conf",
     dnsmasq_config_file => " ",
 #    dnsmasq_dns_servers => '131.154.3.1,131.154.1.3',
     dnsmasq_dns_servers => join(any2array($dnsmasq_servers), ','),
     
   }
-#dep mitaka
-#  file { '/etc/neutron/dnsmasq-neutron.conf':
-#    owner => root,
-#    group => root,
-#    mode  => 644,
-#    content => "dhcp-option-force=26,${mtu}"
-#  }
 
   class { '::neutron::agents::vpnaas':
 #double_external_network
@@ -94,16 +61,8 @@ class iaas::profile::neutron::routeroncontroller (
   }
   class { '::neutron::agents::lbaas': }
   class { '::neutron::agents::metering': }
-#dep mitaka
-#  class { '::neutron::services::fwaas':
-#    vpnaas_agent_package => true
-#  }
 
   class { '::neutron::agents::metadata':
-#dep mitaka
-#    auth_password => $neutron_password,
-#    auth_url => "http://${endpoint_main}:5000/v2.0",
-#    auth_region => $region,
     shared_secret => $neutron_secret,
     metadata_ip => $real_endpoint_admin,
     metadata_port => '8775',
@@ -136,8 +95,6 @@ class iaas::profile::neutron::routeroncontroller (
 #double_external_network, variable modified
 #      bridge_mappings => ['external:br-ex'],
       bridge_mappings => $bridge_mappings,
-#dep mitaka
-#      require => File['etc_default_neutron-server'],
   }
 
 # Set public network if $public_interface != $external_device1

manifests/profile/neutron/server.pp

@@ -27,50 +27,22 @@ class iaas::profile::neutron::server (
   }
 
   class { '::neutron::server':
-#dep mitaka
-#    auth_host => $real_endpoint_admin,
     auth_uri => "http://${endpoint_main}:5000/",
-#mitaka
     auth_url => "http://${real_endpoint_admin}:35357/",
     password => $neutron_password,
     database_connection => $iaas::resources::connectors::neutron,
     database_idle_timeout => 3600,
     enabled => true,
     sync_db => true,
-#dep mitaka
-#    mysql_module => '2.3',
     l3_ha => false,
-#mitaka
     allow_automatic_l3agent_failover => true,
     router_distributed => false,
     project_domain_id => 'default',
-#mitaka
-#    service_providers => [
-#      'LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
-#      'VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default'
-#    ],
+    user_domain_id => 'default',
   }
 
-#  neutron_config {
-#    'keystone_authtoken/auth_host' : value => $real_endpoint_admin;
-#    'keystone_authtoken/auth_type' : value => 'keystone;
-#  }
-
-
-#dep mitaka
-#  neutron_config { 
-#    'DEFAULT/allow_automatic_l3agent_failover' : value => "True";
-##Identity_uri - workaround in juno
-#    'keystone_authtoken/identity_uri' :value => "http://${real_endpoint_admin}:35357";
-#  }
-
   class { '::neutron::keystone::auth':
     password => $neutron_password,
-#dep mitaka
-#    public_address => $endpoint_main,
-#    admin_address => $real_endpoint_admin,
-#    internal_address => $real_endpoint_admin,
-#mitaka
     public_url => "http://${endpoint_main}:9696",
     admin_url => "http://${real_endpoint_admin}:9696",
     internal_url => "http://${real_endpoint_admin}:9696",
@@ -79,7 +51,6 @@ class iaas::profile::neutron::server (
 
   class { '::neutron::server::notifications':
     nova_url => "http://${real_endpoint_admin}:8774/v2",
-#mitaka
     auth_url => "http://${real_endpoint_admin}:35357",
     password => $nova_password,
     region_name => $region,
@@ -98,4 +69,21 @@ class iaas::profile::neutron::server (
     driver => 'neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver',
   }
 
+#Support for neutron-l3 config variables
+  class { '::neutron::agents::l3': 
+    ha_enabled => true,
+    enabled => false,
+    package_ensure => 'absent',
+    manage_service => 'false',
+    external_network_bridge => ' ',
+  }
+
+  package { 'python-neutron-lbaas':
+    ensure => 'installed',
+  }
+
+  package { 'python-neutron-vpnaas':
+    ensure => 'installed',
+  }
+
 }

manifests/profile/nova/common.pp

@@ -56,10 +56,6 @@ class iaas::profile::nova::common (
   }
 
   class { '::nova::network::neutron':
-#dep mitaka
-#    neutron_admin_password => $neutron_password,
-#    neutron_admin_auth_url => "http://${real_endpoint_admin}:35357/v2.0",
-#mitaka
     neutron_password => $neutron_password,
     neutron_auth_url => "http://${real_endpoint_admin}:35357/v3",
     neutron_region_name => $region,
@@ -73,11 +69,7 @@ class iaas::profile::nova::common (
   }
 
   nova_config { 
-##present in mitaka release
-#   'DEFAULT/default_floating_pool': value => $default_flotting_pool;
    'DEFAULT/my_ip': value => $::facts["ipaddress_${admin_interface}"];
-##Identity_uri - workaround in juno
-#   'keystone_authtoken/identity_uri' :value => "http://${real_endpoint_admin}:35357";
   }
 
 }

manifests/profile/nova/compute.pp

@@ -27,16 +27,7 @@ class iaas::profile::nova::compute (
   sysctl::value { "net.ipv4.conf.all.rp_filter": value => "0" }
   sysctl::value { "net.ipv4.conf.default.rp_filter": value => "0" }
 
-#  class { 'ceph::profile::base': } ->
-#  class { 'ceph::profile::client': } ->
-#  class { 'ceph::keys': }
 
-#mitaka-hammer
-#  file {'/etc/apt/preferences.d/ceph.pref':
-#    content => template('iaas/ceph.pref.erb'),
-#    owner   => root,
-#    group   => root,
-#  } ->
   apt::pin { 'ceph':
     priority => '999',
     origin => 'download.ceph.com',

manifests/profile/nova/controller.pp

@@ -41,11 +41,6 @@ class iaas::profile::nova::controller (
 
   class { '::nova::keystone::auth':
     password => $password,
-#dep mitaka
-#    public_address => $endpoint_main,
-#    admin_address => $real_endpoint_admin,
-#    internal_address => $real_endpoint_admin,
-#mitaka
     public_url => "http://${endpoint_main}:8774/v2/%(tenant_id)s",
     internal_url => "http://${real_endpoint_admin}:8774/v2/%(tenant_id)s",
     admin_url => "http://${real_endpoint_admin}:8774/v2/%(tenant_id)s",
@@ -58,8 +53,6 @@ class iaas::profile::nova::controller (
   class { '::nova::api':
     enabled => true,
     admin_password => $password,
-#dep mitaka
-#    auth_host => $endpoint_main,
     auth_uri => "http://${endpoint_main}:5000/",
     identity_uri => "http://${real_endpoint_admin}:35357/",
     neutron_metadata_proxy_shared_secret => $neutron_secret,
@@ -92,9 +85,6 @@ class iaas::profile::nova::controller (
     listen_ip => $::facts["ipaddress_${admin_interface}"],
   }
 
-#  class { [ 'nova::scheduler', 'nova::consoleauth', 'nova::conductor', 'nova::cert']:
-#    enabled => true,
-#  }
 #mitaka add
   class { [ 'nova::scheduler', 'nova::consoleauth', 'nova::conductor']:
     enabled => true,

manifests/role/compute.pp

@@ -22,12 +22,6 @@ $ceph_journal_size      = $iaas::params::ceph_journal_size,
 $libvirt_type = 'kvm',
 
 ) {
-#mitaka-hammer
-# apt::pin { 'ceph':
-#    priority => '999',
-#    origin => 'download.ceph.com',
-# } 
-
 
  ceph::key {
  'client.admin':
@@ -48,17 +42,7 @@ $libvirt_type = 'kvm',
     mode => '0550';
  } 
 
-# Classes
-#  class { 'iaas::profile::base': 
-#        dns_servers             => $iaas::params::dns_servers,
-#        dns_searchdomain        => $iaas::params::dns_searchdomain,
-#  } ->
 
-#  file {'/etc/apt/preferences.d/ceph.pref':
-#    content => template('iaas/ceph.pref.erb'),
-#    owner   => root,
-#    group   => root,
-#  } ->
   class { 'iaas::profile::neutron::client': 
         data_interface => $iaas::params::data_interface,
   } ->

manifests/role/controller.pp

@@ -80,10 +80,6 @@ $neutron_ext2_ipend   = undef,
  } ->
 
 # Classes
-#  class { 'iaas::profile::base': 
-#        dns_servers 		=> $iaas::params::dns_servers,
-#        dns_searchdomain 	=> $iaas::params::dns_searchdomain,
-#  } ->
   class { 'iaas::profile::database-client': } ->
   class { 'iaas::profile::keystone': 
 	tenants 		=> $os_tenants,

manifests/role/controllerandnetwork.pp

@@ -49,10 +49,6 @@ $neutron_ext2_ipend   = undef,
 ##Public Interface method
 $public_interf_method = $iaas::params::public_interf_method,
 
-#dep mitaka
-##MTU VM
-#$mtu = '1438',
-#$mtu = $iaas::params::mtu,
 
 ){
  ceph::key {
@@ -88,18 +84,13 @@ $public_interf_method = $iaas::params::public_interf_method,
  } ->
 
 # Exclude openstack-dashboard-ubuntu-theme package
- apt::pin { 'openstack-dashboard-ubuntu-theme': 
-    packages => 'openstack-dashboard-ubuntu-theme',
-    release => 'openstack-dashboard-ubuntu-theme',
-    component => 'main',
-    priority => -1 
- } ->
+  apt::pin { 'openstack-dashboard-ubuntu-theme': 
+     packages => 'openstack-dashboard-ubuntu-theme',
+     release => 'openstack-dashboard-ubuntu-theme',
+     component => 'main',
+     priority => -1 
+  } ->
 
-# Classes
-#  class { 'iaas::profile::base': 
-#        dns_servers 		=> $iaas::params::dns_servers,
-#        dns_searchdomain 	=> $iaas::params::dns_searchdomain,
-#  } ->
   class { 'iaas::profile::database-client': } ->
   class { 'iaas::profile::keystone': 
 	tenants 		=> $os_tenants,
@@ -186,9 +177,6 @@ $public_interf_method = $iaas::params::public_interf_method,
   } ->
   class { 'iaas::profile::neutron::routeroncontroller':
         public_interf_method    => $public_interf_method,
-#dep mitaka
-#        mtu                     => $mtu,
-#new mitaka
         dnsmasq_servers         => $ml2_dnsmasq_servers,
         external_network1       => $neutron_ext1_network,
         external_gateway1       => $neutron_ext1_gateway,

manifests/role/network.pp

@@ -13,26 +13,10 @@ $neutron_ext2_gateway = undef,
 ##DNSMASQ
 $ml2_dnsmasq_servers = undef,
 
-#dep mitaka
-##MTU VM
-#$mtu = '1438',
-#$mtu = $iaas::params::mtu,
-
 ){
-# Base
-#  class { 'iaas::profile::base': 
-#        dns_servers             => $iaas::params::dns_servers,
-#        dns_searchdomain        => $iaas::params::dns_searchdomain,
-#  } ->
-  file { "/etc/init/neutron-l3-agent.conf":
-    ensure => 'present',
-  } ->
 
   class { 'iaas::profile::neutron::router': 
         public_interf_method    => $public_interf_method,
-#dep mitaka
-#        mtu 			=> $mtu,
-#new mitaka
 	dnsmasq_servers 	=> $ml2_dnsmasq_servers,
         external_network1 	=> $neutron_ext1_network, 
         external_gateway1 	=> $neutron_ext1_gateway, 

manifests/role/rhmk.pp

@@ -59,11 +59,6 @@ class iaas::role::rhmk(
     $zookeeper_id 		= undef,
   ) {
 
-  # Base
-#  class { 'iaas::profile::base': 
-#    dns_servers	=> $dns_servers,
-#    dns_searchdomain	=> $dns_searchdomain,
-#  } ->
   class { 'iaas::profile::database':
     percona_master  	  => $percona_master,
     root_password   	  => $mysql_root_pwd,

templates/openrc.erb

@@ -5,8 +5,8 @@ export OS_SERVICE_ENDPOINT='http://<%= @controller_node %>:35357/v2.0/'
 <% end -%>
 #Mitaka
 export OS_NO_CACHE='<%= @use_no_cache %>'
-export OS_PROJECT_DOMAIN_NAME='<%= @project_domain %>'
-export OS_USER_DOMAIN_NAME='<%= @user_domain %>'
+export OS_PROJECT_DOMAIN_ID='<%= @project_domain %>'
+export OS_USER_DOMAIN_ID='<%= @user_domain %>'
 export OS_PROJECT_NAME='<%= @admin_project %>'
 export OS_USERNAME='<%= @admin_user %>'
 export OS_PASSWORD='<%= @admin_password.gsub(/'/){ %q(\') } %>'