diff --git a/manifests/identity.pp b/manifests/identity.pp
index 66e0a10c..9510f7c8 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -390,7 +390,7 @@ class cloud::identity (
 
 # Configure Keystone
   class { 'keystone':
-    enabled          => false,
+    enabled          => true,
     admin_token      => $ks_admin_token,
     compute_port     => $ks_nova_public_port,
     debug            => $debug,
@@ -434,16 +434,16 @@ class cloud::identity (
 
   keystone_config { 'ssl/enable': ensure => absent }
 
-  include 'apache'
-
-  class {'keystone::wsgi::apache':
-    servername  => $::fqdn,
-    admin_port  => $ks_keystone_admin_port,
-    public_port => $ks_keystone_public_port,
-    # TODO(EmilienM) not sure workers is useful when using WSGI backend
-    workers     => $::processorcount,
-    ssl         => false
-  }
+  # TODO(EmilienM) Disable WSGI - bug #98
+  #include 'apache'
+  # class {'keystone::wsgi::apache':
+  #   servername  => $::fqdn,
+  #   admin_port  => $ks_keystone_admin_port,
+  #   public_port => $ks_keystone_public_port,
+  #   # TODO(EmilienM) not sure workers is useful when using WSGI backend
+  #   workers     => $::processorcount,
+  #   ssl         => false
+  # }
 
   class {'swift::keystone::auth':
     address          => $ks_swift_internal_host,
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 88dfb77e..2e75c15e 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -42,19 +42,6 @@ class cloud::network::controller(
     api_workers   => $::processorcount
   }
 
-  neutron_network { 'public':
-    ensure          => present,
-    router_external => 'True',
-    tenant_name     => $ks_admin_tenant
-  }
-
-  neutron_subnet {'public_subnet':
-    ensure       => present,
-    cidr         => $public_cidr,
-    network_name => 'public',
-    tenant_name  => 'admin'
-  }
-
   @@haproxy::balancermember{"${::fqdn}-neutron_api":
     listening_service => 'neutron_api_cluster',
     server_names      => $::hostname,
diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb
index bc55cdb4..1c8536a3 100644
--- a/spec/classes/cloud_identity_spec.rb
+++ b/spec/classes/cloud_identity_spec.rb
@@ -91,7 +91,7 @@ describe 'cloud::identity' do
 
     it 'configure keystone server' do
       should contain_class('keystone').with(
-        :enabled          => false,
+        :enabled          => true,
         :admin_token      => 'SECRETE',
         :compute_port     => '8774',
         :debug            => true,
@@ -118,15 +118,16 @@ describe 'cloud::identity' do
       )
     end
 
-    it 'configure apache to run keystone with wsgi' do
-      should contain_class('keystone::wsgi::apache').with(
-        :servername  => 'keystone.openstack.org',
-        :admin_port  => '35357',
-        :public_port => '5000',
-        :workers     => '2',
-        :ssl         => false
-      )
-    end
+    # TODO(EmilienM) Disable WSGI - bug #98
+    #  it 'configure apache to run keystone with wsgi' do
+    #    should contain_class('keystone::wsgi::apache').with(
+    #      :servername  => 'keystone.openstack.org',
+    #      :admin_port  => '35357',
+    #      :public_port => '5000',
+    #      :workers     => '2',
+    #      :ssl         => false
+    #    )
+    #  end
 
     it 'configure keystone endpoint' do
       should contain_class('keystone::endpoint').with(