diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-27 18:09:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-27 18:09:24 +0000 |
| commit | 41f0472c22b68f461ab2c97752fbf0aa8b8d98cc (patch) | |
| tree | 760a11632eb5f87ed3d3e609b64625c54a0c6958 /puppet/services/neutron-ovs-agent.yaml | |
| parent | f7062d83d794aacc74614c165a968884285da957 (diff) | |
| parent | b30bdb6f8ed7a041d53849cd56718afd08f4bb98 (diff) | |
Merge "Adds service for OVS and enables ODL DPDK deployments"
Diffstat (limited to 'puppet/services/neutron-ovs-agent.yaml')
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 76d5c269..4493721c 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -92,8 +92,12 @@ resources: RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} - OpenVswitchUpgrade: - type: ./openvswitch-upgrade.yaml + Ovs: + type: ./openvswitch.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} outputs: role_data: @@ -138,7 +142,7 @@ outputs: expression: $.data.ovs_upgrade + $.data.neutron_ovs_upgrade data: ovs_upgrade: - get_attr: [OpenVswitchUpgrade, role_data, upgrade_tasks] + get_attr: [Ovs, role_data, upgrade_tasks] neutron_ovs_upgrade: - name: Check if neutron_ovs_agent is deployed command: systemctl is-enabled neutron-openvswitch-agent |