Browse Source

Add neutron service support for composable upgrades

Change-Id: I9c6116ddb4475b798876635cbb701214759fa33b
Partially-Implements: blueprint overcloud-upgrades-per-service
changes/42/405242/6
Steven Hardy 5 years ago
parent
commit
04ed7e511d
  1. 11
      puppet/services/neutron-api.yaml
  2. 7
      puppet/services/neutron-dhcp.yaml
  3. 9
      puppet/services/neutron-l3.yaml
  4. 7
      puppet/services/neutron-metadata.yaml
  5. 8
      puppet/services/neutron-ovs-agent.yaml
  6. 2
      puppet/services/rabbitmq.yaml

11
puppet/services/neutron-api.yaml

@ -160,3 +160,14 @@ outputs:
neutron::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
upgrade_tasks:
- name: Stop neutron_api service
tags: step2
service: name=neutron-server state=stopped
- name: Sync neutron_api DB
tags: step5
command: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
- name: Start neutron_api service
tags: step6
service: name=neutron-server state=started

7
puppet/services/neutron-dhcp.yaml

@ -74,3 +74,10 @@ outputs:
dport: 68
step_config: |
include tripleo::profile::base::neutron::dhcp
upgrade_tasks:
- name: Stop neutron_dhcp service
tags: step2
service: name=neutron-dhcp-agent state=stopped
- name: Start neutron_dhcp service
tags: step6
service: name=neutron-dhcp-agent state=started

9
puppet/services/neutron-l3.yaml

@ -72,10 +72,17 @@ outputs:
tripleo.neutron_l3.firewall_rules:
'106 neutron_l3 vrrp':
proto: vrrp
-
-
if:
- external_network_bridge_empty
- {}
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
step_config: |
include tripleo::profile::base::neutron::l3
upgrade_tasks:
- name: Stop neutron_l3 service
tags: step2
service: name=neutron-l3-agent state=stopped
- name: Start neutron_l3 service
tags: step6
service: name=neutron-l3-agent state=started

7
puppet/services/neutron-metadata.yaml

@ -75,3 +75,10 @@ outputs:
neutron::agents::metadata::metadata_ip: "%{hiera('nova_metadata_vip')}"
step_config: |
include tripleo::profile::base::neutron::metadata
upgrade_tasks:
- name: Stop neutron_metadata service
tags: step2
service: name=neutron-metadata-agent state=stopped
- name: Start neutron_metadata service
tags: step6
service: name=neutron-metadata-agent state=started

8
puppet/services/neutron-ovs-agent.yaml

@ -113,3 +113,11 @@ outputs:
proto: 'gre'
step_config: |
include ::tripleo::profile::base::neutron::ovs
upgrade_tasks:
- name: Stop neutron_ovs_agent service
tags: step2
service: name=neutron-openvswitch-agent state=stopped
- name: Start neutron_ovs_agent service
tags: step6
service: name=neutron-openvswitch-agent state=started

2
puppet/services/rabbitmq.yaml

@ -107,6 +107,6 @@ outputs:
tags: step2
service: name=rabbitmq-server state=stopped
- name: Start rabbitmq service
tags: step6
tags: step4
service: name=rabbitmq-server state=started
Loading…
Cancel
Save