Remove nova_api_placement from inventory
Since placement is standalone since train, it time we removed nova_api_placement group from inventory and playbooks Change-Id: Ibfab5ce56b36b7b96f8e376aa7f228ad6643cabf
This commit is contained in:
parent
3be600185a
commit
6d8337b327
@ -20,9 +20,6 @@ component_skel:
|
|||||||
nova_api_os_compute:
|
nova_api_os_compute:
|
||||||
belongs_to:
|
belongs_to:
|
||||||
- nova_all
|
- nova_all
|
||||||
nova_api_placement:
|
|
||||||
belongs_to:
|
|
||||||
- nova_all
|
|
||||||
nova_compute:
|
nova_compute:
|
||||||
belongs_to:
|
belongs_to:
|
||||||
- nova_all
|
- nova_all
|
||||||
@ -45,7 +42,6 @@ container_skel:
|
|||||||
contains:
|
contains:
|
||||||
- nova_api_metadata
|
- nova_api_metadata
|
||||||
- nova_api_os_compute
|
- nova_api_os_compute
|
||||||
- nova_api_placement
|
|
||||||
- nova_conductor
|
- nova_conductor
|
||||||
- nova_scheduler
|
- nova_scheduler
|
||||||
- nova_console
|
- nova_console
|
||||||
|
@ -169,9 +169,6 @@ haproxy_default_services:
|
|||||||
haproxy_backend_options:
|
haproxy_backend_options:
|
||||||
- "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
|
- "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
|
||||||
haproxy_service_enabled: "{{ groups['placement_all'] is defined and groups['placement_all'] | length > 0 }}"
|
haproxy_service_enabled: "{{ groups['placement_all'] is defined and groups['placement_all'] | length > 0 }}"
|
||||||
- service:
|
|
||||||
haproxy_service_name: nova_api_placement
|
|
||||||
state: absent
|
|
||||||
- service:
|
- service:
|
||||||
haproxy_service_name: nova_console
|
haproxy_service_name: nova_console
|
||||||
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
|
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
|
||||||
|
@ -198,7 +198,6 @@ neutron_sriov_nic_agent
|
|||||||
|
|
||||||
[nova_all:children]
|
[nova_all:children]
|
||||||
nova_api_metadata
|
nova_api_metadata
|
||||||
nova_api_placement
|
|
||||||
nova_api_os_compute
|
nova_api_os_compute
|
||||||
nova_cert
|
nova_cert
|
||||||
nova_compute
|
nova_compute
|
||||||
@ -206,7 +205,6 @@ nova_conductor
|
|||||||
nova_console
|
nova_console
|
||||||
nova_scheduler
|
nova_scheduler
|
||||||
[nova_api_metadata]
|
[nova_api_metadata]
|
||||||
[nova_api_placement]
|
|
||||||
[nova_api_os_compute]
|
[nova_api_os_compute]
|
||||||
[nova_cert]
|
[nova_cert]
|
||||||
[nova_compute]
|
[nova_compute]
|
||||||
|
@ -63,7 +63,6 @@
|
|||||||
with_items:
|
with_items:
|
||||||
- "nova_api_metadata"
|
- "nova_api_metadata"
|
||||||
- "nova_api_os_compute"
|
- "nova_api_os_compute"
|
||||||
- "nova_api_placement"
|
|
||||||
- "nova_console"
|
- "nova_console"
|
||||||
|
|
||||||
- name: Determine management bridge IP address
|
- name: Determine management bridge IP address
|
||||||
@ -165,5 +164,4 @@
|
|||||||
with_items:
|
with_items:
|
||||||
- "nova_api_metadata"
|
- "nova_api_metadata"
|
||||||
- "nova_api_os_compute"
|
- "nova_api_os_compute"
|
||||||
- "nova_api_placement"
|
|
||||||
- "nova_console"
|
- "nova_console"
|
||||||
|
@ -16,14 +16,14 @@
|
|||||||
- name: Install nova-conductor services
|
- name: Install nova-conductor services
|
||||||
import_playbook: common-playbooks/nova.yml
|
import_playbook: common-playbooks/nova.yml
|
||||||
vars:
|
vars:
|
||||||
nova_hosts: "nova_conductor:nova_scheduler:nova_api_os_compute:nova_api_placement:nova_api_metadata:nova_console"
|
nova_hosts: "nova_conductor:nova_scheduler:nova_api_os_compute:nova_api_metadata:nova_console"
|
||||||
nova_serial: "{{ nova_conductor_serial | default(['1', '100%']) }}"
|
nova_serial: "{{ nova_conductor_serial | default(['1', '100%']) }}"
|
||||||
|
|
||||||
|
|
||||||
- name: Install nova compute
|
- name: Install nova compute
|
||||||
import_playbook: common-playbooks/nova.yml
|
import_playbook: common-playbooks/nova.yml
|
||||||
vars:
|
vars:
|
||||||
nova_hosts: "nova_compute:!nova_conductor:!nova_scheduler:!nova_api_os_compute:!nova_api_placement:!nova_api_metadata:!nova_console"
|
nova_hosts: "nova_compute:!nova_conductor:!nova_scheduler:!nova_api_os_compute:!nova_api_metadata:!nova_console"
|
||||||
nova_serial: "{{ nova_compute_serial | default('100%') }}"
|
nova_serial: "{{ nova_compute_serial | default('100%') }}"
|
||||||
|
|
||||||
|
|
||||||
@ -75,11 +75,10 @@
|
|||||||
run_once: yes
|
run_once: yes
|
||||||
|
|
||||||
|
|
||||||
# Note that the placement API service and the console services do not
|
# Note that the console services do not understand how to reload, so they fail
|
||||||
# understand how to reload, so they fail when you try to make them do
|
# when you try to make them do so. We therefore restart them instead.
|
||||||
# so. We therefore restart them instead.
|
|
||||||
- name: Reload all nova services which support a reload to ensure new RPC object version is used
|
- name: Reload all nova services which support a reload to ensure new RPC object version is used
|
||||||
hosts: "nova_all:!nova_api_placement:!nova_console"
|
hosts: "nova_all:!nova_console"
|
||||||
gather_facts: no
|
gather_facts: no
|
||||||
serial: "{{ nova_serial | default('100%') }}"
|
serial: "{{ nova_serial | default('100%') }}"
|
||||||
user: root
|
user: root
|
||||||
@ -101,18 +100,17 @@
|
|||||||
# https://bugs.launchpad.net/openstack-ansible/+bug/1715374
|
# https://bugs.launchpad.net/openstack-ansible/+bug/1715374
|
||||||
#
|
#
|
||||||
service_action: "restarted"
|
service_action: "restarted"
|
||||||
service_negate: "{{ ['nova-placement-api.service', 'nova-novncproxy.service', 'nova-spicehtml5proxy.service' ] + nova_service_negate | default([]) }}"
|
service_negate: "{{ ['nova-novncproxy.service', 'nova-spicehtml5proxy.service' ] + nova_service_negate | default([]) }}"
|
||||||
when:
|
when:
|
||||||
- "nova_all_software_updated | bool"
|
- "nova_all_software_updated | bool"
|
||||||
- "ansible_local['openstack_ansible']['nova']['need_service_restart'] | bool"
|
- "ansible_local['openstack_ansible']['nova']['need_service_restart'] | bool"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Note that the placement API service and the console services do not
|
# Note that the console services do not understand how to reload, so they fail
|
||||||
# understand how to reload, so they fail when you try to make them do
|
# when you try to make them do so. We therefore restart them instead.
|
||||||
# so. We therefore restart them instead.
|
|
||||||
- name: Restart the remaining nova services to ensure new RPC object version is used
|
- name: Restart the remaining nova services to ensure new RPC object version is used
|
||||||
hosts: "nova_api_placement:nova_console"
|
hosts: "nova_console"
|
||||||
gather_facts: no
|
gather_facts: no
|
||||||
serial: "{{ nova_api_serial | default(['1', '100%']) }}"
|
serial: "{{ nova_api_serial | default(['1', '100%']) }}"
|
||||||
user: root
|
user: root
|
||||||
|
@ -409,7 +409,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
|
|||||||
'nova_api_metadata',
|
'nova_api_metadata',
|
||||||
'nova_api_os_compute',
|
'nova_api_os_compute',
|
||||||
'nova_api_container',
|
'nova_api_container',
|
||||||
'nova_api_placement',
|
|
||||||
'nova_compute',
|
'nova_compute',
|
||||||
'nova_compute_container',
|
'nova_compute_container',
|
||||||
'nova_conductor',
|
'nova_conductor',
|
||||||
|
Loading…
Reference in New Issue
Block a user