Moved Performance check ansible plays to seperate folder 'check'.

ansible/adjustment/site.yml

@@ -3,7 +3,7 @@
 # Playbook to change number of workers for nova and keystone services
 #
 
-- hosts: controllers 
+- hosts: controller
   remote_user: heat-admin
   vars:
     deployment: eventlet

ansible/check/roles/ceph/tasks/main.yml

@@ -0,0 +1,9 @@
+---
+#
+# Checks specific to ceph nodes
+#
+
+- name: Check Ceph cluster health status
+  shell: ceph status
+  register: ceph_status
+  failed_when: "'HEALTH_OK' not in '{{ ceph_status.stdout }}'"

ansible/check/roles/common/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 #
-# Tests common to Controller/Compute/Director
+# Tests common to Director/Controller/Compute/Ceph
 #
 
 - name: Get selinux mode

ansible/check/roles/controller/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 #
-# Tests specific to controller hosts
+# Performance checks specific to controller hosts
 #
 
 - name: Check max_connections

ansible/check/roles/keystone/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+#
+# Keystone tasks for performance checks
+#
+
+- name: Check Keystone cron job
+  command: crontab -l -u keystone
+  register: keystone_cron_result
+  changed_when: no
+  failed_when: "'token_flush' not in '{{ keystone_cron_result.stdout }}'"
+  ignore_errors: True
+
+- name: Check Keystone Token Provider
+  command: crudini --get /etc/keystone/keystone.conf token provider
+  register: keystone_token_provider
+  changed_when: no
+  ignore_errors: True

ansible/check/site.yml

@@ -0,0 +1,32 @@
+---
+#
+# Playbook to check OSP install for common performance tuning issues
+#
+
+- hosts: controller
+  remote_user: heat-admin
+  vars:
+    tuned_profile: throughput-performance
+    rabbitmq_fd: 2048 
+    mariadb_max_connections: 4096
+  roles:
+  - common
+  - controller
+  - keystone
+
+- hosts: compute
+  remote_user: heat-admin
+  vars:
+    tuned_profile: virtual-host
+  roles:
+  - common
+  - compute
+
+- hosts: ceph
+  remote_user: heat-admin
+  vars:
+    # Place holder for now, unsure of what recommended tuned profile is.
+    tuned_profile: throughput-performance
+  roles:
+  - common
+  - ceph

ansible/gen_hostfile.sh

@@ -67,14 +67,14 @@ echo "[director]" | tee ${ansible_inventory_file}
 echo "${ospd_ip_address}" | tee -a ${ansible_inventory_file}
 if [[ ${#controllers_hn} -gt 0 ]]; then
  echo "" | tee -a ${ansible_inventory_file}
- echo "[controllers]" | tee -a ${ansible_inventory_file}
+ echo "[controller]" | tee -a ${ansible_inventory_file}
  for ct in ${controllers_hn[@]}; do
   echo "${ct}" | tee -a ${ansible_inventory_file}
  done
 fi
 if [[ ${#compute_hn} -gt 0 ]]; then
  echo "" | tee -a ${ansible_inventory_file}
- echo "[computes]" | tee -a ${ansible_inventory_file}
+ echo "[compute]" | tee -a ${ansible_inventory_file}
  for c in ${compute_hn[@]}; do
   echo "${c}" | tee -a ${ansible_inventory_file}
  done

ansible/group_vars/all

@@ -1,4 +1,5 @@
 ---
+ansible_sudo: yes
 
 pbench: true
 #pbench: "{{ lookup('env','PBENCH') }}"

ansible/group_vars/computes

@@ -1,4 +0,0 @@
----
-ansible_sudo: yes
-
-tuned_profile: virtual-host

ansible/group_vars/controllers

@@ -1,12 +1,4 @@
 ---
-ansible_sudo: yes
-
-#
-# Number of Service workers for OpenStack
-#
-num_workers: 24
-num_workers: "{{ lookup('env','NUM_WORKERS') }}"
-
 #
 # Tool for monitoring database connections
 #
@@ -15,8 +7,3 @@ connmon: true
 connmon_host: 192.0.2.1
 
 dns_server: 8.8.8.8
-
-tuned_profile: throughput-performance
-rabbitmq_fd: 2048 
-mariadb_max_connections: 4096
-

ansible/roles/keystone/tasks/main.yml

@@ -1,18 +1,4 @@
 ---
 #
-# Keystone tasks to change the number of eventlet workers
+# Keystone tasks
 #
-
-- name: Check Keystone cron job
-  command: crontab -l -u keystone
-  register: keystone_cron_result
-  changed_when: no
-  failed_when: "'token_flush' not in '{{ keystone_cron_result.stdout }}'"
-  ignore_errors: True
-  when: not install
-
-- name: Check Keystone Token Provider
-  command: crudini --get /etc/keystone/keystone.conf token provider
-  register: keystone_token_provider
-  changed_when: no
-  ignore_errors: True

ansible/site-check.yml

@@ -1,19 +0,0 @@
----
-#
-# Playbook to check OSP install for common performance tuning issues
-#
-
-- hosts: controllers
-  remote_user: heat-admin
-  vars:
-    install: False
-  roles:
-  - common
-  - controller
-  - keystone
-
-- hosts: computes
-  remote_user: heat-admin
-  roles:
-  - common
-  - compute

ansible/site-install.yml

@@ -3,7 +3,7 @@
 # Playbook to install connmon and pbench on director/overcloud
 #
 
-- hosts: controllers
+- hosts: controller
   remote_user: heat-admin
   vars:
     install: True