Refactor CI playbook into sub playbooks
So originally this commit was for ceph compatible gather but I was never super confident that my solution was good on the other hand I made a useful refactor while working on that which I want to keep and commit. This breaks the previously monolithic CI playbook into smaller playbooks that can be composed more easily. Hopefully useful as we move to seperating integration and performance testing. Change-Id: I9fe48a65861caacaf8092d52d837801eec246fb0
This commit is contained in:
parent
330a5c9129
commit
6e0960a743
@ -26,40 +26,50 @@
|
||||
shell: mysql -e "show variables like 'max_connections';" | grep max_connections | awk '{print $2}'
|
||||
register: max_conn
|
||||
ignore_errors: true
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name: Set max database connections
|
||||
set_fact:
|
||||
openstack_mysql_max_connections: "{{ max_conn.stdout }}"
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name : Get file descriptors for the mysql process
|
||||
shell: cat /proc/$(pgrep mysqld_safe)/limits | grep "open files" | awk '{print $4}'
|
||||
register: mysql_desc
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name: Set file descriptors fact for mysql
|
||||
set_fact:
|
||||
openstack_mysql_file_descriptors: "{{ mysql_desc.stdout }}"
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name : Get rabbitmq file descriptors
|
||||
shell: rabbitmqctl status | grep total_limit | awk -F',' '{print $2}' | sed 's/.$//'
|
||||
register: rabbitmq_desc
|
||||
ignore_errors: true
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name: Set rabbitmq file descriptors
|
||||
set_fact:
|
||||
openstack_rabbitmq_file_descriptors: "{{ rabbitmq_desc.stdout }}"
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name: Get Controller Nodes number
|
||||
shell: source ~/stackrc; nova list | grep controller | grep ACTIVE | wc -l
|
||||
register: controller_count
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name : Set Controler number fact
|
||||
set_fact:
|
||||
osp_controllers_number: "{{ controller_count.stdout }}"
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name: Get Compute Nodes number
|
||||
shell: source ~/stackrc; nova list | grep compute | grep ACTIVE | wc -l
|
||||
register: compute_count
|
||||
when: undercloud_conf.stat.exists
|
||||
|
||||
- name : Set Commpute number fact
|
||||
set_fact:
|
||||
osp_computes_number: "{{ compute_count.stdout }}"
|
||||
when: undercloud_conf.stat.exists
|
||||
|
@ -1,60 +1,19 @@
|
||||
---
|
||||
- include: baremetal-prep-virthost.yml
|
||||
|
||||
- name: Configure Browbeat
|
||||
hosts: undercloud
|
||||
roles:
|
||||
- browbeat/pre-install-setup
|
||||
- include: configure-browbeat.yml
|
||||
|
||||
- name: Setup Undercloud CollectD
|
||||
hosts: undercloud
|
||||
vars:
|
||||
config_type: "{{group_names[0]}}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/epel
|
||||
- browbeat/collectd-openstack
|
||||
- include: undercloud-collectd.yml
|
||||
|
||||
- include: baremetal-quickstart-extras.yml
|
||||
|
||||
- name: Install Browbeat
|
||||
hosts: undercloud
|
||||
vars:
|
||||
results_in_httpd: false
|
||||
statsd_host: "{{ graphite_host }}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/browbeat
|
||||
- browbeat/firewall
|
||||
- browbeat/perfkitbenchmarker
|
||||
- browbeat/rally
|
||||
- browbeat/shaker
|
||||
- browbeat/yoda
|
||||
- browbeat/flavors
|
||||
- browbeat/images
|
||||
- browbeat/browbeat-network
|
||||
- browbeat/template-configs
|
||||
- browbeat/statsd-ironic
|
||||
- browbeat/oooq-metadata
|
||||
- include: install-browbeat.yml
|
||||
|
||||
- name: Disable sshd dns
|
||||
hosts: overcloud
|
||||
vars:
|
||||
disable_ssh_dns: true
|
||||
roles:
|
||||
- browbeat/no-sshd-dns
|
||||
- include: disable-ssh-dns.yml
|
||||
|
||||
- name: Setup Overcloud CollectD
|
||||
hosts: overcloud
|
||||
vars:
|
||||
config_type: "{{group_names[0]}}"
|
||||
graphite_host: "{{graphite_host_template}}"
|
||||
graphite_password: "{{graphite_password_template}}"
|
||||
graphite_prefix: "{{graphite_prefix_template}}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/epel
|
||||
- browbeat/collectd-openstack
|
||||
- include: overcloud-collectd.yml
|
||||
|
||||
- include: gather-metadata.yml
|
||||
|
||||
- name: Run Browbeat
|
||||
hosts: undercloud
|
||||
|
5
ansible/oooq/configure-browbeat.yml
Normal file
5
ansible/oooq/configure-browbeat.yml
Normal file
@ -0,0 +1,5 @@
|
||||
---
|
||||
- name: Configure Browbeat
|
||||
hosts: undercloud
|
||||
roles:
|
||||
- browbeat/pre-install-setup
|
7
ansible/oooq/disable-ssh-dns.yml
Normal file
7
ansible/oooq/disable-ssh-dns.yml
Normal file
@ -0,0 +1,7 @@
|
||||
---
|
||||
- name: Disable sshd dns
|
||||
hosts: overcloud
|
||||
vars:
|
||||
disable_ssh_dns: true
|
||||
roles:
|
||||
- browbeat/no-sshd-dns
|
36
ansible/oooq/gather-metadata.yml
Normal file
36
ansible/oooq/gather-metadata.yml
Normal file
@ -0,0 +1,36 @@
|
||||
---
|
||||
- hosts: compute
|
||||
remote_user: "heat_admin"
|
||||
become: true
|
||||
roles:
|
||||
- browbeat-metadata/common
|
||||
- browbeat-metadata/compute
|
||||
|
||||
- hosts: controller
|
||||
remote_user: "heat_admin"
|
||||
become: true
|
||||
roles:
|
||||
- browbeat-metadata/common
|
||||
- browbeat-metadata/nova
|
||||
- browbeat-metadata/neutron
|
||||
- browbeat-metadata/keystone
|
||||
- browbeat-metadata/ceilometer
|
||||
- browbeat-metadata/gnocchi
|
||||
- browbeat-metadata/cinder
|
||||
- browbeat-metadata/heat
|
||||
- browbeat-metadata/mysql
|
||||
- browbeat-metadata/rabbitmq
|
||||
- browbeat-metadata/glance
|
||||
|
||||
- hosts: undercloud
|
||||
remote_user: "stack"
|
||||
become: true
|
||||
roles:
|
||||
- browbeat-metadata/common
|
||||
- browbeat-metadata/undercloud
|
||||
|
||||
- name: Dump metadata to files
|
||||
hosts: undercloud
|
||||
roles:
|
||||
- browbeat-metadata/dump-facts
|
||||
- browbeat/oooq-metadata
|
18
ansible/oooq/install-browbeat.yml
Normal file
18
ansible/oooq/install-browbeat.yml
Normal file
@ -0,0 +1,18 @@
|
||||
---
|
||||
- name: Install Browbeat
|
||||
hosts: undercloud
|
||||
vars:
|
||||
results_in_httpd: false
|
||||
statsd_host: "{{ graphite_host }}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/browbeat
|
||||
- browbeat/firewall
|
||||
- browbeat/perfkitbenchmarker
|
||||
- browbeat/rally
|
||||
- browbeat/shaker
|
||||
- browbeat/flavors
|
||||
- browbeat/images
|
||||
- browbeat/browbeat-network
|
||||
- browbeat/template-configs
|
||||
- browbeat/statsd-ironic
|
12
ansible/oooq/overcloud-collectd.yml
Normal file
12
ansible/oooq/overcloud-collectd.yml
Normal file
@ -0,0 +1,12 @@
|
||||
---
|
||||
- name: Setup Overcloud CollectD
|
||||
hosts: overcloud
|
||||
vars:
|
||||
config_type: "{{group_names[0]}}"
|
||||
graphite_host: "{{graphite_host_template}}"
|
||||
graphite_password: "{{graphite_password_template}}"
|
||||
graphite_prefix: "{{graphite_prefix_template}}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/epel
|
||||
- browbeat/collectd-openstack
|
@ -2,34 +2,18 @@
|
||||
|
||||
- include: quickstart-extras.yml
|
||||
|
||||
- name: Configure Browbeat
|
||||
hosts: undercloud
|
||||
roles:
|
||||
- browbeat/pre-install-setup
|
||||
- browbeat/oooq-metadata
|
||||
- include: configure-browbeat.yml
|
||||
|
||||
- name: Install Browbeat
|
||||
hosts: undercloud
|
||||
vars:
|
||||
results_in_httpd: false
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/browbeat
|
||||
- browbeat/browbeat-results
|
||||
- browbeat/firewall
|
||||
- browbeat/perfkitbenchmarker
|
||||
- browbeat/rally
|
||||
- browbeat/shaker
|
||||
- browbeat/yoda
|
||||
- browbeat/flavors
|
||||
- browbeat/images
|
||||
- browbeat/browbeat-network
|
||||
- browbeat/template-configs
|
||||
- include: undercloud-collectd.yml
|
||||
|
||||
- include: overcloud-collectd.yml
|
||||
|
||||
- include: install-browbeat.yml
|
||||
|
||||
- include: gather-metadata.yml
|
||||
|
||||
- name: Run Browbeat
|
||||
hosts: undercloud
|
||||
roles:
|
||||
- browbeat/collectd
|
||||
- browbeat/bug-check
|
||||
- browbeat/browbeat-run
|
||||
- browbeat/browbeat-classify
|
||||
|
9
ansible/oooq/undercloud-collectd.yml
Normal file
9
ansible/oooq/undercloud-collectd.yml
Normal file
@ -0,0 +1,9 @@
|
||||
---
|
||||
- name: Setup Undercloud CollectD
|
||||
hosts: undercloud
|
||||
vars:
|
||||
config_type: "{{group_names[0]}}"
|
||||
roles:
|
||||
- browbeat/common
|
||||
- browbeat/epel
|
||||
- browbeat/collectd-openstack
|
@ -30,6 +30,7 @@ upload-dir = doc/build/html
|
||||
|
||||
[files]
|
||||
data_files =
|
||||
usr/local/share/ansible/roles/browbeat-metadata/ = ansible/gather/roles/*
|
||||
usr/local/share/ansible/roles/browbeat/ = ansible/install/roles/*
|
||||
usr/local/share/ansible/roles/browbeat/ = ansible/oooq/roles/*
|
||||
usr/local/share/ansible/roles/browbeat/browbeat/vars/ = ci-scripts/config/tripleo/oooq-browbeat-role/*
|
||||
|
Loading…
Reference in New Issue
Block a user