Merge branch 'dev_vncserver' into 'dev'

Added parameters to configure memcache and VNC-server to enable VNC console



See merge request !16

examples/hieradata/common.yaml

@@ -76,6 +76,9 @@ iaas::role::endpoint::main_hostname: '10.101.32.x' # VIP Hostname
 iaas::role::endpoint::main_address: 10.101.32.x # The main virtual address pointing to the load-balancers
 iaas::role::endpoint::coordination: ['10.101.32.x:2181,10.101.32.x:2181'] # coordination for zookeeper, controllers
 
+# Memcache
+iaas::memcache::coordination: ['10.101.32.x:11211','10.101.32.x:11211'] # Set memcache servers and related port
+
 # Galera MySQL
 iaas::mysql::keystone::user: keystone
 iaas::mysql::keystone::password: keystone
@@ -160,4 +163,4 @@ iaas::profile::horizon::secret: horizon
 # Ceilometer
 iaas::profile::ceilometer::servers: ["10.101.32.x", "10.101.32.x"] # controllers ip
 iaas::profile::ceilometer::secret: ceilometer
-iaas::profile::ceilometer::password: ceilometer
\ No newline at end of file
+iaas::profile::ceilometer::password: ceilometer

manifests/profile/nova/common.pp

@@ -16,6 +16,9 @@ class iaas::profile::nova::common (
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
+
+# Memcache
+  $memcache = hiera('iaas::memcache::coordination', false),
 ) {
   include iaas::resources::connectors
 
@@ -33,6 +36,8 @@ class iaas::profile::nova::common (
     rabbit_password => $rabbitmq_password,
     mysql_module => '2.3',
     database_idle_timeout => 3600,
+# Memcache1.1.0
+    memcached_servers => $memcache,
   }
 
   class { '::nova::network::neutron':
@@ -42,6 +47,11 @@ class iaas::profile::nova::common (
     neutron_url => "http://${endpoint}:9696",
   }
 
+# Set VNC host
+  class { '::nova::vncproxy::common':
+    vncproxy_host => $endpoint,
+  }
+
   nova_config { 
    'DEFAULT/default_floating_pool': value => $default_flotting_pool;
    'DEFAULT/my_ip': value => $::facts["ipaddress_${admin_interface}"];

manifests/profile/nova/controller.pp

@@ -41,6 +41,17 @@ class iaas::profile::nova::controller (
     host => $::facts["ipaddress_${admin_interface}"],
   }
 
+# Set VNC-server variables
+  nova_config {
+    'DEFAULT/vncserver_listen' :                        value =>$::facts["ipaddress_${admin_interface}"];
+    'DEFAULT/vncserver_proxyclient_address' :           value =>$::facts["ipaddress_${admin_interface}"];
+  }
+
+#Set memcached variables for VNC console
+  class { '::memcached':
+    listen_ip => $::facts["ipaddress_${admin_interface}"],
+  }
+
   class { [ 'nova::scheduler', 'nova::consoleauth', 'nova::conductor', 'nova::cert']:
     enabled => true,
   }