From 95be69f5a69fc6c38e102267f8ed3720676d85a8 Mon Sep 17 00:00:00 2001 From: Joe Talerico Date: Wed, 3 Feb 2016 16:46:47 -0500 Subject: [PATCH] Update Adjustments Allow adjustments to do more than just workers. Also implement tags to break tasks up, or chain them. + Adding L3 Adjustments + Removing tags... + Removing Debug & Verbose logging - break out into different commit + Remove become from group_vars/all Change-Id: Ic50094345f44284e267a5e48b1f60c04b568a520 --- ansible/browbeat/adjustment-l3.yml | 17 ++++++++++ ansible/browbeat/adjustment-workers.yml | 23 ++++++++++++++ ansible/browbeat/adjustment.yml | 21 ------------- ansible/browbeat/group_vars/all | 1 - ansible/browbeat/keystone_token_type.yml | 2 ++ .../handlers/main.yml | 0 .../{cinder => cinder-workers}/tasks/main.yml | 2 -- .../files/keystone_httpd | 0 .../handlers/main.yml | 0 .../tasks/main.yml | 2 -- .../templates/keystone_ports.conf.j2 | 0 .../templates/keystone_wsgi.conf.j2 | 0 .../{neutron => neutron-l3}/handlers/main.yml | 0 .../browbeat/roles/neutron-l3/tasks/main.yml | 21 +++++++++++++ .../roles/neutron-workers/handlers/main.yml | 31 +++++++++++++++++++ .../tasks/main.yml | 2 -- .../{nova => nova-workers}/handlers/main.yml | 0 .../{nova => nova-workers}/tasks/main.yml | 2 -- 18 files changed, 94 insertions(+), 30 deletions(-) create mode 100644 ansible/browbeat/adjustment-l3.yml create mode 100644 ansible/browbeat/adjustment-workers.yml delete mode 100644 ansible/browbeat/adjustment.yml rename ansible/browbeat/roles/{cinder => cinder-workers}/handlers/main.yml (100%) rename ansible/browbeat/roles/{cinder => cinder-workers}/tasks/main.yml (89%) rename ansible/browbeat/roles/{keystone => keystone-workers}/files/keystone_httpd (100%) rename ansible/browbeat/roles/{keystone => keystone-workers}/handlers/main.yml (100%) rename ansible/browbeat/roles/{keystone => keystone-workers}/tasks/main.yml (97%) rename ansible/browbeat/roles/{keystone => keystone-workers}/templates/keystone_ports.conf.j2 (100%) rename ansible/browbeat/roles/{keystone => keystone-workers}/templates/keystone_wsgi.conf.j2 (100%) rename ansible/browbeat/roles/{neutron => neutron-l3}/handlers/main.yml (100%) create mode 100644 ansible/browbeat/roles/neutron-l3/tasks/main.yml create mode 100644 ansible/browbeat/roles/neutron-workers/handlers/main.yml rename ansible/browbeat/roles/{neutron => neutron-workers}/tasks/main.yml (89%) rename ansible/browbeat/roles/{nova => nova-workers}/handlers/main.yml (100%) rename ansible/browbeat/roles/{nova => nova-workers}/tasks/main.yml (86%) diff --git a/ansible/browbeat/adjustment-l3.yml b/ansible/browbeat/adjustment-l3.yml new file mode 100644 index 000000000..e11981f2b --- /dev/null +++ b/ansible/browbeat/adjustment-l3.yml @@ -0,0 +1,17 @@ +--- +# +# Playbook to change number of Neutron l3 agents +# +# Change l3 agents Example: +# ansible-playbook -i hosts browbeat/adjustment-l3.yml -e "max_l3_agents=3 min_l3_agents=3" +# + +- hosts: controller + remote_user: heat-admin + gather_facts: false + vars: + ansible_become: true + max_l3_agents: 3 + min_l3_agents: 2 + roles: + - neutron-l3 diff --git a/ansible/browbeat/adjustment-workers.yml b/ansible/browbeat/adjustment-workers.yml new file mode 100644 index 000000000..f68fe4714 --- /dev/null +++ b/ansible/browbeat/adjustment-workers.yml @@ -0,0 +1,23 @@ +--- +# +# Playbook to change number of workers for nova,cinder and keystone services +# +# Change Workers Example: +# ansible-playbook -i hosts browbeat/adjustment-workers.yml -e "workers=12" +# +# Change Workers and Keystone Deployment Example: +# ansible-playbook -i hosts browbeat/adjustment-workers.yml -e "workers=12 keystone_deployment=httpd" +# + +- hosts: controller + remote_user: heat-admin + gather_facts: false + vars: + ansible_become: true + workers: 24 + threads: 6 + roles: + - nova-workers + - neutron-workers + - keystone-workers + - cinder-workers diff --git a/ansible/browbeat/adjustment.yml b/ansible/browbeat/adjustment.yml deleted file mode 100644 index 58a628ffc..000000000 --- a/ansible/browbeat/adjustment.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# -# Playbook to change number of workers for nova and keystone services -# -# Change Workers Example: -# ansible-playbook -i hosts browbeat/adjustment.yml -e "workers=12" -# -# Change Workers and Keystone Deployment Example: -# ansible-playbook -i hosts browbeat/adjustment.yml -e "workers=12 keystone_deployment=httpd" -# - -- hosts: controller - remote_user: heat-admin - gather_facts: false - vars: - workers: 24 - threads: 6 - roles: - - nova - - neutron - - keystone diff --git a/ansible/browbeat/group_vars/all b/ansible/browbeat/group_vars/all index d12894ffa..ed97d539c 100644 --- a/ansible/browbeat/group_vars/all +++ b/ansible/browbeat/group_vars/all @@ -1,2 +1 @@ --- -ansible_become: true diff --git a/ansible/browbeat/keystone_token_type.yml b/ansible/browbeat/keystone_token_type.yml index 3f4d79314..51acc2883 100644 --- a/ansible/browbeat/keystone_token_type.yml +++ b/ansible/browbeat/keystone_token_type.yml @@ -9,5 +9,7 @@ - hosts: controller remote_user: heat-admin + vars: + ansible_become: true roles: - keystone-token diff --git a/ansible/browbeat/roles/cinder/handlers/main.yml b/ansible/browbeat/roles/cinder-workers/handlers/main.yml similarity index 100% rename from ansible/browbeat/roles/cinder/handlers/main.yml rename to ansible/browbeat/roles/cinder-workers/handlers/main.yml diff --git a/ansible/browbeat/roles/cinder/tasks/main.yml b/ansible/browbeat/roles/cinder-workers/tasks/main.yml similarity index 89% rename from ansible/browbeat/roles/cinder/tasks/main.yml rename to ansible/browbeat/roles/cinder-workers/tasks/main.yml index 566b8c8fe..80a89e54c 100644 --- a/ansible/browbeat/roles/cinder/tasks/main.yml +++ b/ansible/browbeat/roles/cinder-workers/tasks/main.yml @@ -14,10 +14,8 @@ backup: yes with_items: - { section: DEFAULT, option: osapi_volume_workers, value: "{{ workers }}" } - - { section: DEFAULT, option: debug, value: False } notify: - unmanage cinder services - restart cinder services - manage cinder services - cleanup cinder services - diff --git a/ansible/browbeat/roles/keystone/files/keystone_httpd b/ansible/browbeat/roles/keystone-workers/files/keystone_httpd similarity index 100% rename from ansible/browbeat/roles/keystone/files/keystone_httpd rename to ansible/browbeat/roles/keystone-workers/files/keystone_httpd diff --git a/ansible/browbeat/roles/keystone/handlers/main.yml b/ansible/browbeat/roles/keystone-workers/handlers/main.yml similarity index 100% rename from ansible/browbeat/roles/keystone/handlers/main.yml rename to ansible/browbeat/roles/keystone-workers/handlers/main.yml diff --git a/ansible/browbeat/roles/keystone/tasks/main.yml b/ansible/browbeat/roles/keystone-workers/tasks/main.yml similarity index 97% rename from ansible/browbeat/roles/keystone/tasks/main.yml rename to ansible/browbeat/roles/keystone-workers/tasks/main.yml index 6ddd69750..d0bc2c059 100644 --- a/ansible/browbeat/roles/keystone/tasks/main.yml +++ b/ansible/browbeat/roles/keystone-workers/tasks/main.yml @@ -43,8 +43,6 @@ value: "{{ item.value }}" backup: yes with_items: - - { section: DEFAULT, option: verbose, value: False } - - { section: DEFAULT, option: debug, value: False } - { section: DEFAULT, option: public_workers, value: "{{ workers }}" } - { section: DEFAULT, option: admin_workers, value: "{{ workers }}" } - { section: eventlet_server, option: public_workers, value: "{{ workers }}" } diff --git a/ansible/browbeat/roles/keystone/templates/keystone_ports.conf.j2 b/ansible/browbeat/roles/keystone-workers/templates/keystone_ports.conf.j2 similarity index 100% rename from ansible/browbeat/roles/keystone/templates/keystone_ports.conf.j2 rename to ansible/browbeat/roles/keystone-workers/templates/keystone_ports.conf.j2 diff --git a/ansible/browbeat/roles/keystone/templates/keystone_wsgi.conf.j2 b/ansible/browbeat/roles/keystone-workers/templates/keystone_wsgi.conf.j2 similarity index 100% rename from ansible/browbeat/roles/keystone/templates/keystone_wsgi.conf.j2 rename to ansible/browbeat/roles/keystone-workers/templates/keystone_wsgi.conf.j2 diff --git a/ansible/browbeat/roles/neutron/handlers/main.yml b/ansible/browbeat/roles/neutron-l3/handlers/main.yml similarity index 100% rename from ansible/browbeat/roles/neutron/handlers/main.yml rename to ansible/browbeat/roles/neutron-l3/handlers/main.yml diff --git a/ansible/browbeat/roles/neutron-l3/tasks/main.yml b/ansible/browbeat/roles/neutron-l3/tasks/main.yml new file mode 100644 index 000000000..952cb4843 --- /dev/null +++ b/ansible/browbeat/roles/neutron-l3/tasks/main.yml @@ -0,0 +1,21 @@ +--- +# +# Neutron tasks for Browbeat +# + +- name: Configure min_l3_agents + ini_file: + dest: /etc/neutron/neutron.conf + mode: 0640 + section: "{{ item.section }}" + option: "{{ item.option }}" + value: "{{ item.value }}" + backup: yes + with_items: + - { section: DEFAULT, option: max_l3_agents_per_router, value: "{{ max_l3_agents }}" } + - { section: DEFAULT, option: min_l3_agents_per_router, value: "{{ min_l3_agents }}" } + notify: + - unmanage neutron services + - restart neutron services + - manage neutron services + - cleanup neutron services diff --git a/ansible/browbeat/roles/neutron-workers/handlers/main.yml b/ansible/browbeat/roles/neutron-workers/handlers/main.yml new file mode 100644 index 000000000..24354005b --- /dev/null +++ b/ansible/browbeat/roles/neutron-workers/handlers/main.yml @@ -0,0 +1,31 @@ +--- +# +# Neutron handlers for browbeat adjustment +# + +- name: unmanage neutron services + command: pcs resource unmanage {{ item }} + with_items: + - neutron-server + - neutron-metadata-agent + ignore_errors: true + +- name: restart neutron services + service: name={{ item }} state=restarted + with_items: + - neutron-server + - neutron-metadata-agent + +- name: manage neutron services + command: pcs resource manage {{ item }} + with_items: + - neutron-server + - neutron-metadata-agent + ignore_errors: true + +- name: cleanup neutron services + command: pcs resource cleanup {{ item }} + with_items: + - neutron-server + - neutron-metadata-agent + ignore_errors: true diff --git a/ansible/browbeat/roles/neutron/tasks/main.yml b/ansible/browbeat/roles/neutron-workers/tasks/main.yml similarity index 89% rename from ansible/browbeat/roles/neutron/tasks/main.yml rename to ansible/browbeat/roles/neutron-workers/tasks/main.yml index 3e4950c2c..4e9a60c9b 100644 --- a/ansible/browbeat/roles/neutron/tasks/main.yml +++ b/ansible/browbeat/roles/neutron-workers/tasks/main.yml @@ -13,8 +13,6 @@ value: "{{ item.value }}" backup: yes with_items: - - { section: DEFAULT, option: verbose, value: False } - - { section: DEFAULT, option: debug, value: False } - { section: DEFAULT, option: api_workers, value: "{{ workers }}" } - { section: DEFAULT, option: rpc_workers, value: "{{ workers }}" } notify: diff --git a/ansible/browbeat/roles/nova/handlers/main.yml b/ansible/browbeat/roles/nova-workers/handlers/main.yml similarity index 100% rename from ansible/browbeat/roles/nova/handlers/main.yml rename to ansible/browbeat/roles/nova-workers/handlers/main.yml diff --git a/ansible/browbeat/roles/nova/tasks/main.yml b/ansible/browbeat/roles/nova-workers/tasks/main.yml similarity index 86% rename from ansible/browbeat/roles/nova/tasks/main.yml rename to ansible/browbeat/roles/nova-workers/tasks/main.yml index 23171e336..77e969461 100644 --- a/ansible/browbeat/roles/nova/tasks/main.yml +++ b/ansible/browbeat/roles/nova-workers/tasks/main.yml @@ -13,8 +13,6 @@ value: "{{ item.value }}" backup: yes with_items: - - { section: DEFAULT, option: verbose, value: False } - - { section: DEFAULT, option: debug, value: False } - { section: DEFAULT, option: ec2_workers, value: "{{ workers }}" } - { section: DEFAULT, option: osapi_compute_workers, value: "{{ workers }}" } - { section: DEFAULT, option: metadata_workers, value: "{{ workers }}" }