identity: fix keystone::wsgi::apache (refs: #4524)

params.pp

@@ -52,32 +52,32 @@ class os_params {
   $ks_admin_password = 'Xokoph5io2aenaoh0nuiquei9aineigo'
   $ks_admin_tenant = 'admin'
   $ks_admin_token = 'iw3feche3JeeYo9mejoohaugai3thohahwo9tiuyoe5Thier8Eiwah8K'
-  $ks_keystone_internal_host = 'os-ci-test3.enovance.com'
+  $ks_keystone_internal_host = 'os-ci-test13.enovance.com'
   $ks_keystone_internal_port = '5000'
   $ks_keystone_internal_proto = 'http'
-  $ks_keystone_admin_host = 'os-ci-test3.enovance.com'
+  $ks_keystone_admin_host = 'os-ci-test13.enovance.com'
   $ks_keystone_admin_port = '35357'
   $ks_keystone_admin_proto = 'http'
-  $ks_keystone_public_host = 'os-ci-test3.enovance.com'
+  $ks_keystone_public_host = 'os-ci-test13.enovance.com'
   $ks_keystone_public_port = '5000'
   $ks_keystone_public_proto = 'http'
 
   # Swift
   $ks_swift_internal_proto = 'http'
-  $ks_swift_admin_host = 'os-ci-test3.enovance.com'
+  $ks_swift_admin_host = 'os-ci-test13.enovance.com'
   $ks_swift_admin_port = '8080'
   $ks_swift_admin_proto = 'http'
   $ks_swift_dispersion_password = 'aipee1die1eeSohph9yae8eeluthaleu'
-  $ks_swift_internal_host = 'os-ci-test3.enovance.com'
+  $ks_swift_internal_host = 'os-ci-test13.enovance.com'
   $ks_swift_internal_port = '8080'
   $ks_swift_password = 'cwnu6Eeph4jahsh5wooch5Panahjaidie8'
-  $ks_swift_public_host = 'os-ci-test3.enovance.com'
+  $ks_swift_public_host = 'os-ci-test13.enovance.com'
   $ks_swift_public_port = '8080'
   $ks_swift_public_proto = 'http'
   $replicas = '3'
   $statsd_host = '127.0.0.1'
   $statsd_port = '4125'
-  $swift_cors_allow_origin = 'http://os-ci-test3.enovance.com'
+  $swift_cors_allow_origin = 'http://os-ci-test13.enovance.com'
   $swift_hash_suffix = 'ni2aseiWi8ich3oo'
   $swift_memchached = ["${ip_range}.57:11211"]
   $swift_port = '8080'
@@ -108,23 +108,23 @@ class os_params {
   $secret_key   = 'fcDLLrpFMMxn1iBK8WiiqrY9yeGDvA'
 
   # RabbitMQ
-  $rabbit_names = ['os-ci-test3']
+  $rabbit_names = ['os-ci-test13']
   $rabbit_hosts = ["${ip_range}.57:5672"]
   $rabbit_password = 'okaeTh3aiwiewohk'
   # Useful when we need a single Rabbit host (like Sensu needs)
-  $rabbit_main_host = 'os-ci-test3'
+  $rabbit_main_host = 'os-ci-test13'
 
 
   # Neutron
   $external_int = 'eth1'
-  $ks_neutron_admin_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_admin_host = 'os-ci-test13.enovance.com'
   $ks_neutron_admin_port = '9696'
   $ks_neutron_admin_proto = 'http'
-  $ks_neutron_internal_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_internal_host = 'os-ci-test13.enovance.com'
   $ks_neutron_internal_port = '9696'
   $ks_neutron_internal_proto = 'http'
   $ks_neutron_password = 'AJJTg2fSWrE4X4L1rhKJI74njLpFB0'
-  $ks_neutron_public_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_public_host = 'os-ci-test13.enovance.com'
   $ks_neutron_public_port = '9696'
   $ks_neutron_public_proto = 'http'
   $neutron_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"]
@@ -141,13 +141,13 @@ class os_params {
   $nova_db_password = 'Ae3tooch8shohNai9ooqueik9gaevo'
   $nova_db_user = 'nova'
   $nova_port = '8774'
-  $ks_nova_admin_host = 'os-ci-test3.enovance.com'
+  $ks_nova_admin_host = 'os-ci-test13.enovance.com'
   $ks_nova_admin_port = '8774'
   $ks_nova_admin_proto = 'http'
-  $ks_nova_internal_host = 'os-ci-test3.enovance.com'
+  $ks_nova_internal_host = 'os-ci-test13.enovance.com'
   $ks_nova_internal_port = '8774'
   $ks_nova_internal_proto = 'http'
-  $ks_nova_public_host = 'os-ci-test3.enovance.com'
+  $ks_nova_public_host = 'os-ci-test13.enovance.com'
   $ks_nova_public_port = '8774'
   $ks_ec2_public_port = '8773'
   $ks_metadata_public_port = '8775'
@@ -161,13 +161,13 @@ class os_params {
   $glance_db_password = 'uYgNjBzjMjv2fD0yD3LqiQQPKEKuXA'
   $glance_db_user = 'glance'
   $glance_port = '9292'
-  $ks_glance_admin_host = 'os-ci-test3.enovance.com'
+  $ks_glance_admin_host = 'os-ci-test13.enovance.com'
   $ks_glance_admin_port = '9292'
   $ks_glance_admin_proto = 'http'
-  $ks_glance_internal_host = 'os-ci-test3.enovance.com'
+  $ks_glance_internal_host = 'os-ci-test13.enovance.com'
   $ks_glance_internal_port = '9292'
   $ks_glance_internal_proto = 'http'
-  $ks_glance_public_host = 'os-ci-test3.enovance.com'
+  $ks_glance_public_host = 'os-ci-test13.enovance.com'
   $ks_glance_public_port = '9292'
   $ks_glance_public_proto = 'http'
   $ks_glance_password = 'WUBDUbox7gDz3GP6EAYWGos9VBPh82'
@@ -175,14 +175,14 @@ class os_params {
   # Ceilometer
   $ceilometer_database_connection = "mongodb://${ip_range}.57/ceilometer"
   $ceilometer_secret = 'S45ILumu44rxn5u7spnbJws9XiWomc'
-  $ks_ceilometer_admin_host = 'os-ci-test3.enovance.com'
+  $ks_ceilometer_admin_host = 'os-ci-test13.enovance.com'
   $ks_ceilometer_admin_port = '8777'
   $ks_ceilometer_admin_proto = 'http'
-  $ks_ceilometer_internal_host = 'os-ci-test3.enovance.com'
+  $ks_ceilometer_internal_host = 'os-ci-test13.enovance.com'
   $ks_ceilometer_internal_port = '8777'
   $ks_ceilometer_internal_proto = 'http'
   $ks_ceilometer_password = 'eafhafbheafaefaejiiutiu7374aesf3aiNu'
-  $ks_ceilometer_public_host = 'os-ci-test3.enovance.com'
+  $ks_ceilometer_public_host = 'os-ci-test13.enovance.com'
   $ks_ceilometer_public_port = '8777'
   $ks_ceilometer_public_proto = 'http'
 
@@ -195,14 +195,14 @@ class os_params {
   $cinder_rbd_secret_uuid = '95c98032-ad65-5db8-f5d3-5bd09cd563ef'
   $cinder_rbd_user = 'cinder_rbd'
   $glance_api_version = '2'
-  $ks_cinder_admin_host = 'os-ci-test3.enovance.com'
+  $ks_cinder_admin_host = 'os-ci-test13.enovance.com'
   $ks_cinder_admin_port = '8776'
   $ks_cinder_admin_proto = 'http'
-  $ks_cinder_internal_host = 'os-ci-test3.enovance.com'
+  $ks_cinder_internal_host = 'os-ci-test13.enovance.com'
   $ks_cinder_internal_port = '8776'
   $ks_cinder_internal_proto = 'http'
   $ks_cinder_password = '768JIxDvnrBbwGaRRn5mHjrzz9jNJi'
-  $ks_cinder_public_host = 'os-ci-test3.enovance.com'
+  $ks_cinder_public_host = 'os-ci-test13.enovance.com'
   $ks_cinder_public_port = '8776'
   $ks_cinder_public_proto = 'http'
 
@@ -211,18 +211,18 @@ class os_params {
   $heat_db_host = "${ip_range}.57"
   $heat_db_password = 'rooghah0phe1tieDeixoodo0quil8iox'
   $heat_db_user = 'heat'
-  $ks_heat_admin_host = 'os-ci-test3.enovance.com'
+  $ks_heat_admin_host = 'os-ci-test13.enovance.com'
   $ks_heat_admin_port = '8004'
   $ks_heat_cfn_admin_port = '8000'
   $ks_heat_cloudwatch_admin_port = '8003'
   $ks_heat_admin_proto = 'http'
-  $ks_heat_internal_host = 'os-ci-test3.enovance.com'
+  $ks_heat_internal_host = 'os-ci-test13.enovance.com'
   $ks_heat_internal_port = '8004'
   $ks_heat_cfn_internal_port = '8000'
   $ks_heat_cloudwatch_internal_port = '8003'
   $ks_heat_internal_proto = 'http'
   $ks_heat_password = 'EIMMvWvDPEvI08ggT2azYMhGdsNXe6'
-  $ks_heat_public_host = 'os-ci-test3.enovance.com'
+  $ks_heat_public_host = 'os-ci-test13.enovance.com'
   $ks_heat_public_port = '8004'
   $ks_heat_cfn_public_port = '8000'
   $ks_heat_cloudwatch_public_port = '8003'

roles/identity/identity-controller.pp

@@ -128,8 +128,10 @@ class os_identity_controller (
   include 'apache'
 
   class {'keystone::wsgi::apache':
+    servername  => $::fqdn,
     admin_port  => $ks_keystone_admin_port,
     public_port => $ks_keystone_public_port,
+    workers     => $::processorcount,
     ssl         => false,
   }
 

site.pp

@@ -59,6 +59,8 @@ node 'os-ci-test4', /pmaster\d+.enovance.com/ inherits common{
 # Controller nodes (x3)
 node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inherits common {
 
+# os-ci-test13 is the main mgmt
+
 ## Databases:
     class {'os_nosql_node':}
     class {'os_sql_node':}