Haproxy to use consul for service discovery

Setup Haproxy to use consul for service discovery. Earlier it was using etcd. Also, update the tests. 1. Have the openrc file used for testing use the lb.keystone.service.consul address. 2. Be way more aggressive about the test used to validate a functional haproxy instance. Ensure that it is forwarding traffic to both keystone as well as glance explicitly.
sorenisanerd · Oct 20, 2014 · 4af0bbb · 4af0bbb
1 parent f2b8ec6
commit 4af0bbb
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 57 deletions.
diff --git a/files/maybe-upgrade.sh b/files/maybe-upgrade.sh
@@ -13,12 +13,10 @@ rv=$?
 
 run_puppet() {
         # ensure that our service catalog hiera data is available
-        python -m jiocloud.orchestrate --host=etcd.service.consul cache_services
         # now run puppet
         puppet apply --detailed-exitcodes --logdest=syslog `puppet config print manifestdir`/site.pp
         # publish the results of that run
         ret_code=$?
-        python -m jiocloud.orchestrate --host=etcd.service.consul publish_service
         python -m jiocloud.orchestrate --host=etcd.service.consul update_own_status puppet $ret_code
         if [[ $ret_code = 1 || $ret_code = 4 || $ret_code = 6 ]]; then
                 echo "Puppet failed with return code ${ret_code}"

diff --git a/hiera/data/common.yaml b/hiera/data/common.yaml
@@ -68,7 +68,7 @@ rjil::keystone::test_user::password: test_password
 openstack_extras::auth_file::admin_password: "%{hiera('rjil::keystone::test_user::password')}"
 openstack_extras::auth_file::admin_user: test_user
 openstack_extras::auth_file::admin_tenant: test_tenant
-openstack_extras::auth_file::controller_node: "keystone.service.consul"
+openstack_extras::auth_file::controller_node: "lb.keystone.service.consul"
 
 ########### glance config
 ###################################

diff --git a/hiera/data/env/at.yaml b/hiera/data/env/at.yaml
@@ -9,10 +9,6 @@ glance::bind_host: "%{ipaddress_eth0}"
 rjil::jiocloud::etcd::addr: "%{ipaddress_eth0}:4001"
 rjil::jiocloud::etcd::peer_addr: "%{ipaddress_eth0}:7001"
 
-rjil::haproxy::openstack::keystone_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::keystone_internal_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::glance_ips: "%{lookup_array('services::glance::eth0')}"
-
 rjil::keystone::public_address: "%{ipaddress_eth0}"
 
 rjil::ceph::storage_cluster_if: eth0

diff --git a/hiera/data/env/production.yaml b/hiera/data/env/production.yaml
@@ -24,10 +24,6 @@ cinder_internal_address: "volume-beta.jiocloud.com"
 rjil::jiocloud::etcd::addr: "%{ipaddress_eth0}:4001"
 rjil::jiocloud::etcd::peer_addr: "%{ipaddress_eth0}:7001"
 
-rjil::haproxy::openstack::keystone_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::keystone_internal_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::glance_ips: "%{lookup_array('services::glance::eth0')}"
-
 rjil::keystone::public_address: "%{ipaddress_eth0}"
 
 # Don't let Jenkins log in in production

diff --git a/hiera/data/env/staging.yaml b/hiera/data/env/staging.yaml
@@ -9,10 +9,6 @@ glance::bind_host: "%{ipaddress_eth2}"
 rjil::jiocloud::etcd::addr: "%{ipaddress_eth2}:4001"
 rjil::jiocloud::etcd::peer_addr: "%{ipaddress_eth2}:7001"
 
-rjil::haproxy::openstack::keystone_ips: "%{lookup_array('services::keystone::eth2')}"
-rjil::haproxy::openstack::keystone_internal_ips: "%{lookup_array('services::keystone::eth2')}"
-rjil::haproxy::openstack::glance_ips: "%{lookup_array('services::glance::eth2')}"
-
 rjil::keystone::public_address: "%{ipaddress_eth2}"
 
 rjil::ceph::storage_cluster_if: eth2

diff --git a/hiera/data/env/vagrant-vbox.yaml b/hiera/data/env/vagrant-vbox.yaml
@@ -12,10 +12,6 @@ rjil::jiocloud::consul::server::bind_addr: "%{ipaddress_eth1}"
 rjil::jiocloud::consul::bootstrapserver::bind_addr: "%{ipaddress_eth1}"
 rjil::jiocloud::consul::agent::bind_addr: "%{ipaddress_eth1}"
 
-rjil::haproxy::openstack::keystone_ips: "%{lookup_array('services::keystone::eth1')}"
-rjil::haproxy::openstack::keystone_internal_ips: "%{lookup_array('services::keystone::eth1')}"
-rjil::haproxy::openstack::glance_ips: "%{lookup_array('services::glance::eth1')}"
-
 rjil::keystone::public_address: "%{ipaddress_eth1}"
 
 rjil::ceph::storage_cluster_if: eth1

diff --git a/hiera/data/env/vagrantlxc.yaml b/hiera/data/env/vagrantlxc.yaml
@@ -9,8 +9,4 @@ glance::bind_host: "%{ipaddress_eth0}"
 rjil::jiocloud::etcd::addr: "%{ipaddress_eth0}:4001"
 rjil::jiocloud::etcd::peer_addr: "%{ipaddress_eth0}:7001"
 
-rjil::haproxy::openstack::keystone_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::keystone_internal_ips: "%{lookup_array('services::keystone::eth0')}"
-rjil::haproxy::openstack::glance_ips: "%{lookup_array('services::glance::eth0')}"
-
 rjil::keystone::public_address: "%{ipaddress_eth0}"
diff --git a/hiera/data/role_env/ocdb-at.yaml b/hiera/data/role_env/ocdb-at.yaml
@@ -1,2 +1 @@
 rjil::db::bind_address: "%{ipaddress_eth0}"
-services::db::eth0: ["%{ipaddress_eth0}"]
diff --git a/hiera/data/role_env/ocdb-staging.yaml b/hiera/data/role_env/ocdb-staging.yaml
@@ -1,2 +1 @@
 rjil::db::bind_address: "%{ipaddress_eth2}"
-services::db::eth0: ["%{ipaddress_eth2}"]
diff --git a/hiera/data/role_env/ocdb-vagrant-vbox.yaml b/hiera/data/role_env/ocdb-vagrant-vbox.yaml
@@ -1,2 +1 @@
 rjil::db::bind_address: "%{ipaddress_eth1}"
-services::db::eth1: ["%{ipaddress_eth1}"]
diff --git a/lib/puppet/parser/functions/service_discover_consul.rb b/lib/puppet/parser/functions/service_discover_consul.rb
@@ -0,0 +1,37 @@
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Puppet::Parser::Functions
+  newfunction(
+  :service_discover_consul,
+  :type  => :rvalue,
+  :doc   => <<-'EOS'
+
+Given the name of a service and optionally, a tag, this function
+returns a hash of the form:
+  (name => ip_address)
+for each host that registered that service in consul
+
+  EOS
+  ) do |args|
+    name = args.shift
+    tag  = args.shift
+    raise(ArgumentError, "name must be specified") unless name
+    consul_host = args.shift || '127.0.0.1'
+    consul_port = args.shift || '8500'
+    tag_query = tag ? "?tag=#{tag}" : ''
+    uri = URI("http://#{consul_host}:#{consul_port}/v1/catalog/service/#{name}#{tag_query}")
+    res = Net::HTTP.get_response(uri)
+    if res.code == '200'
+      results = JSON.parse(res.body)
+      ret_hash = {}
+      results.each do |node|
+        ret_hash[node['Node']] = node['Address']
+      end
+      ret_hash
+    else
+      raise(Puppet::Error, "Uri: #{uri.to_s}, returned code #{res.code}")
+    end
+  end
+end
diff --git a/manifests/db.pp b/manifests/db.pp
@@ -20,8 +20,6 @@
 
   rjil::test { 'mysql.sh': }
 
-  rjil::profile { 'db': }
-
   ## Call db_def to create databases, users and grants
   create_resources('rjil::db::instance', $dbs)
   ## setup mysql server

diff --git a/manifests/glance.pp b/manifests/glance.pp
@@ -11,8 +11,6 @@
   ## Add tests for glance api and registry
   include rjil::test::glance
 
-  rjil::profile { 'glance': }
-
   # ensure that we don't even try to configure the
   # database connection until the service is up
   ensure_resource( 'rjil::service_blocker', 'mysql', {})

diff --git a/manifests/haproxy/openstack.pp b/manifests/haproxy/openstack.pp
@@ -1,10 +1,14 @@
+#
+# Class: rjil::haproxy::openstack
+#   Setup openstack services in haproxy.
+#
 class rjil::haproxy::openstack(
-  $horizon_ips           = [],
-  $keystone_ips          = [],
-  $keystone_internal_ips = [],
-  $glance_ips            = [],
-  $cinder_ips            = [],
-  $nova_ips              = [],
+  $horizon_ips           = values(service_discover_consul('horizon', 'real')),
+  $keystone_ips          = values(service_discover_consul('keystone', 'real')),
+  $keystone_internal_ips = values(service_discover_consul('keystone-admin', 'real')),
+  $glance_ips            = values(service_discover_consul('glance', 'real')),
+  $cinder_ips            = values(service_discover_consul('cinder', 'real')),
+  $nova_ips              = values(service_discover_consul('nova', 'real')),
   $horizon_port          = '80',
   $horizon_https_port    = '443',
   $novncproxy_port       = '6080',
@@ -18,8 +22,6 @@
   $nova_ec2_port         = '8773',
 ) {
 
-  rjil::profile { 'controller_load_balancer': }
-
   class { 'rjil::test::haproxy_openstack':
     horizon_ips           => $horizon_ips,
     keystone_ips          => $keystone_ips,

diff --git a/manifests/keystone.pp b/manifests/keystone.pp
@@ -20,8 +20,6 @@
 
   include rjil::test::keystone
 
-  rjil::profile { 'keystone': }
-
   if $public_address == '0.0.0.0' {
     $address = '127.0.0.1'
   } else {

diff --git a/manifests/profile.pp b/manifests/profile.pp
diff --git a/manifests/test/haproxy_openstack.pp b/manifests/test/haproxy_openstack.pp
@@ -11,9 +11,8 @@
 
   include rjil::test::base
 
-  if ($keystone_ips != [] or $keystone_internal_ips != []) {
-    include keystone::client
-  }
+  include keystone::client
+  include glance::client
 
   file { "/usr/lib/jiocloud/tests/haproxy_openstack.sh":
     content => template('rjil/tests/haproxy_openstack.sh.erb'),

diff --git a/templates/tests/haproxy_openstack.sh.erb b/templates/tests/haproxy_openstack.sh.erb
@@ -2,6 +2,5 @@
 set -e
 test -f /root/openrc
 source /root/openrc
-<% if @keystone_ips != [] -%>
 keystone catalog
-<% end %>
+glance image-list