Merge branch 'dev_zookeeper' into dev

examples/hieradata/common.yaml

@@ -76,7 +76,11 @@ iaas::role::endpoint::servers: ['ocp-tb-1','ocp-tb-2','ocp-tb-3'] # List of load
 iaas::main_hostname: '10.101.32.x' # VIP Hostname (public)
 iaas::main_address: 10.101.32.x # The main virtual address pointing to the load-balancers
 iaas::admin_address: 10.101.32.x # The private 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
+#iaas::role::endpoint::coordination: ['10.101.32.x:2181,10.101.32.x:2181'] # coordination for zookeeper, controllers
+
+# Zookeeper - NEW
+iaas::profile::zookeeper::servers: ["ocp-tb-1-priv", "ocp-tb-2-priv", "ocp-tb-3-priv"]
+iaas::profile::zookeeper::coordination: ['10.101.34.x:2181,10.101.34.x:2181,10.101.34.x:2181']
 
 # Memcache
 iaas::memcache::coordination: ['10.101.32.x:11211','10.101.32.x:11211'] # Set memcache servers and related port

examples/manifests/site.pp

@@ -221,6 +221,8 @@ $rabbit_hostnames = ['rb-tb-1-priv','rb-tb-2-priv','rb-tb-3-priv']
 #       haproxy_controller_hosts => $haproxy_controller_hosts, 
 #       haproxy_controller_ips => $haproxy_controller_ips, 
 #       rabbit_hostname => $rabbit_hostnames[0],
+##set zookeeper index (1,..,N)
+#       zookeeper_id => '1',
 #  }
 #}
 #
@@ -237,6 +239,8 @@ $rabbit_hostnames = ['rb-tb-1-priv','rb-tb-2-priv','rb-tb-3-priv']
 #       haproxy_controller_hosts => $haproxy_controller_hosts, 
 #       haproxy_controller_ips => $haproxy_controller_ips, 
 #       rabbit_hostname => $rabbit_hostnames[1],
+##set zookeeper index (1,..,N)
+#       zookeeper_id => '2',
 # }
 #}
 #
@@ -253,6 +257,8 @@ $rabbit_hostnames = ['rb-tb-1-priv','rb-tb-2-priv','rb-tb-3-priv']
 #       haproxy_controller_hosts => $haproxy_controller_hosts, 
 #       haproxy_controller_ips => $haproxy_controller_ips, 
 #       rabbit_hostname => $rabbit_hostnames[2],
+##set zookeeper index (1,..,N)
+#       zookeeper_id => '3',
 # }
 #}
 

manifests/profile/ceilometer/controller.pp

 class iaas::profile::ceilometer::controller (
   $password = hiera('iaas::profile::ceilometer::password', undef),
-  $servers = hiera('iaas::profile::ceilometer::servers', undef),
+#  $servers = hiera('iaas::profile::ceilometer::servers', undef),
 
   $public_interface = hiera('iaas::public_interface', undef),
   $admin_interface = hiera('iaas::admin_interface', undef),
 
   $region = hiera('iaas::region', undef),
 
-  $zookeeper_id = undef,
-  $zookeeper_max_connections = 128,
+#  $zookeeper_id = undef,
+#  $zookeeper_max_connections = 128,
 
-  $coordination_ip = hiera('iaas::role::endpoint::coordination', undef),
+#  $coordination_ip = hiera('iaas::role::endpoint::coordination', undef),
+  $coordination_ip = hiera('iaas::profile::zookeeper::coordination', undef),
 
 #VIP1
   $endpoint_main = hiera('iaas::main_address', undef),
@@ -55,14 +56,24 @@ class iaas::profile::ceilometer::controller (
     mysql_module => '2.3',
   }
 
+# Python-zake package
   package { 'python-zake': }
 
-  class { 'zookeeper':
-    id => $zookeeper_id,
-    client_ip => $::facts["ipaddress_${admin_interface}"],
-    servers => $servers,
-    max_allowed_connections => $zookeeper_max_connections,
-  }
+# Moved to a self-consistent profile
+# with the following variables (see variable declaration on top):
+#  $servers = hiera('iaas::profile::ceilometer::servers', undef),
+#  $zookeeper_id = undef,
+#  $zookeeper_max_connections = 128,
+#
+# Python-zake package
+#  package { 'python-zake': }
+#
+#  class { 'zookeeper':
+#    id => $zookeeper_id,
+#    client_ip => $::facts["ipaddress_${admin_interface}"],
+#    servers => $servers,
+#    max_allowed_connections => $zookeeper_max_connections,
+#  }
 
   class { '::ceilometer::agent::central':
     coordination_url => "kazoo://${$coordination_ip}",

manifests/profile/zookeeper.pp

+class iaas::profile::ceilometer::controller (
+  $admin_interface = hiera('iaas::admin_interface', undef), 
+  $servers = hiera('iaas::profile::zookeeper::servers', undef),
+  $zookeeper_id = undef,
+  $zookeeper_max_connections = 128,
+
+) {
+
+# Python-zake package 
+  package { 'python-zake': }
+
+  class { 'zookeeper':
+    id => $zookeeper_id,
+    client_ip => $::facts["ipaddress_${admin_interface}"],
+    servers => $servers,
+    max_allowed_connections => $zookeeper_max_connections,
+  }
+
+}

manifests/role/controller.pp

@@ -13,7 +13,7 @@ $zookeeper_id = undef,
   class { 'iaas::profile::neutron::server': } ->
 #  class { 'iaas::profile::neutron::router': } -> 
   class { 'iaas::profile::ceilometer::controller': 
-    zookeeper_id => $zookeeper_id
+#    zookeeper_id => $zookeeper_id
   } ->
   class { 'iaas::profile::heat': } ->
   class { 'iaas::profile::horizon': } ->

manifests/role/rhmk.pp

@@ -12,6 +12,7 @@ class iaas::role::rhmk(
     $main_address = undef,
     $admin_address = undef,
     $rabbit_hostname = undef,
+    $zookeeper_id => undef,
   ) {
   # Base
   class { 'iaas::profile::base': } ->
@@ -36,4 +37,7 @@ class iaas::role::rhmk(
   class { 'iaas::profile::rabbitmq': 
     node_hostname => $rabbit_hostname,
   } 
+  class { 'iaas::profile::zookeeper':
+    zookeeper_id => $zookeeper_id
+  }
 }