Skip to content

Commit

Permalink
Merge "Update the playbook serial settings" into stable/newton
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Aug 23, 2017
2 parents 3f2ca52 + 4e346c9 commit 0e38977
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
7 changes: 3 additions & 4 deletions playbooks/os-cinder-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
include: common-playbooks/cinder.yml
vars:
cinder_hosts: "cinder_volume:!cinder_scheduler:!cinder_api"
cinder_serial: "{{ cinder_backend_serial | default('1') }}"
cinder_serial: "{{ cinder_backend_serial | default('100%') }}"



- name: Install cinder backup services
include: common-playbooks/cinder.yml
vars:
cinder_hosts: "cinder_backup:!cinder_volume:!cinder_scheduler:!cinder_api"
cinder_serial: "{{ cinder_backend_serial | default('1') }}"
cinder_serial: "{{ cinder_backend_serial | default('100%') }}"



Expand All @@ -97,7 +97,6 @@
- name: Refresh local facts after all software changes are made
hosts: cinder_all
gather_facts: no
max_fail_percentage: 20
user: root
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
Expand Down Expand Up @@ -140,7 +139,7 @@
- name: Restart cinder agents to ensure new RPC object version is used
hosts: cinder_backup,cinder_volume,cinder_scheduler
gather_facts: no
serial: "{{ cinder_backend_serial | default('1') }}"
serial: "{{ cinder_backend_serial | default('100%') }}"
max_fail_percentage: 20
user: root
environment: "{{ deployment_environment_variables | default({}) }}"
Expand Down
5 changes: 2 additions & 3 deletions playbooks/os-neutron-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
- name: Prepare MQ/DB services
hosts: neutron_all
gather_facts: no
max_fail_percentage: 20
user: root
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
Expand Down Expand Up @@ -87,12 +86,12 @@
include: common-playbooks/neutron.yml
vars:
neutron_hosts: "neutron_linuxbridge_agent:neutron_openvswitch_agent:!neutron_server"
neutron_serial: "{{ neutron_agent_serial | default('20%') }}"
neutron_serial: "{{ neutron_agent_serial | default('50%') }}"



- name: Install all other neutron agents
include: common-playbooks/neutron.yml
vars:
neutron_hosts: "neutron_all:!neutron_linuxbridge_agent:!neutron_openvswitch_agent:!neutron_server"
neutron_serial: "{{ neutron_other_serial | default('1') }}"
neutron_serial: "{{ neutron_other_serial | default('20%') }}"
2 changes: 1 addition & 1 deletion playbooks/os-nova-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
include: common-playbooks/nova.yml
vars:
nova_hosts: "nova_compute:!nova_conductor:!nova_scheduler:!nova_consoleauth:!nova_cert:!nova_api_os_compute:!nova_api_metadata:!nova_console"
nova_serial: "{{ nova_compute_serial | default('20%') }}"
nova_serial: "{{ nova_compute_serial | default('50%') }}"



Expand Down
3 changes: 1 addition & 2 deletions playbooks/rabbitmq-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
# http://www.rabbitmq.com/clustering.html#upgrading
- name: Stop RabbitMQ nodes that are not the upgrader
hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}[1:]"
serial: 1
max_fail_percentage: 0
user: root
tasks:
Expand All @@ -49,7 +48,7 @@

- name: Install rabbitmq server
hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}"
serial: 1
serial: 20%
max_fail_percentage: 20
user: root
roles:
Expand Down

0 comments on commit 0e38977

Please sign in to comment.