aboutsummaryrefslogtreecommitdiffstats
path: root/samples/ping-hot.yaml
blob: e61c33c8f1d806a21a94b4bf142831c252816480 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
##############################################################################
# Copyright (c) 2017 Ericsson AB and others.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
# Sample benchmark task config file to measure network latency using ping
# An external HOT template (file) is configured in the context section using
# the heat_template attribute. Parameters for the template is specified with the
# heat_parameters attribute.

schema: "yardstick:task:0.1"

scenarios:
-
  type: Ping
  options:
    packetsize: 200
  host:
    name: "server1.demo"
    public_ip_attr: "server1_public_ip"
  target:
    name: "server2.demo"
    private_ip_attr: "server2_private_ip"

  runner:
    type: Duration
    duration: 60
    interval: 1

  sla:
    max_rtt: 10
    action: monitor

context:
  name: demo
  user: cirros
  heat_template: /tmp/heat-templates/hot/servers_in_new_neutron_net.yaml
  heat_parameters:
    image: yardstick-image
    flavor: yardstick-flavor
    key_name: yardstick
    public_net: "660fc7c3-7a56-4faf-91e5-3c9ebdda0104"
    private_net_name: "test"
    private_net_cidr: "10.0.1.0/24"
    private_net_gateway: "10.0.1.1"
    private_net_pool_start: "10.0.1.2"
    private_net_pool_end: "10.0.1.200"
work_types = {{ server.backend.tenant_network_types }} {%- for mechanism_name, mechanism in server.get('backend', {}).get('mechanism', []).items() %} {%- do mechanism_drivers.append(mechanism.get('driver')) if 'driver' in mechanism %} {%- endfor %} -{%- if "vxlan" in server.backend.tenant_network_types %} +{%- set opendaylight_enabled = true if 'opendaylight' in mechanism_drivers|join else false %} +{%- if "vxlan" in server.backend.tenant_network_types and not opendaylight_enabled %} {%- do mechanism_drivers.append('l2population') %} {%- endif %} mechanism_drivers = {{ ','.join(mechanism_drivers) }} @@ -311,3 +312,11 @@ ovn_nb_connection = tcp:{{ server.controller_vip }}:6641 ovn_sb_connection = tcp:{{ server.controller_vip }}:6642 ovn_l3_scheduler = leastloaded {%- endif %} + +{%- if opendaylight_enabled %} +[ml2_odl] +port_binding_controller = pseudo-agentdb-binding +url = http://{{ server.backend.host }}:{{ server.backend.rest_api_port }}/controller/nb/v2/neutron +username = {{ server.backend.user }} +password = {{ server.backend.password }} +{%- endif %} diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian index 123386d..d77f6c8 100644 --- a/neutron/files/ocata/neutron-generic.conf.Debian +++ b/neutron/files/ocata/neutron-generic.conf.Debian @@ -37,7 +37,7 @@ auth_strategy = keystone core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin -service_plugins =neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,neutron.services.metering.metering_plugin.MeteringPlugin +service_plugins = {{ neutron.backend.get('router', 'router')}}, metering {% endif %} @@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # needs to execute commands in Dom0 in the hypervisor of XenServer, this item # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session # to pass commands to Dom0. (string value) -root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf +#root_helper_daemon = <None> # Seconds between nodes reporting state to server; should be less than # agent_down_time, best if it is half or less than agent_down_time. (floating @@ -2092,3 +2092,8 @@ heartbeat_rate = 2 # Sets the list of available ciphers. value should be a string in the OpenSSL # cipher list format. (string value) #ciphers = <None> + +{%- if neutron.backend.ovsdb_connection is defined %} +[ovs] +ovsdb_connection = {{ neutron.backend.ovsdb_connection }} +{%- endif %} diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian index 79376a2..a7a4645 100644 --- a/neutron/files/ocata/neutron-server.conf.Debian +++ b/neutron/files/ocata/neutron-server.conf.Debian @@ -50,7 +50,7 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin {% set l3_plugin = 'networking_ovn.l3.l3_ovn.OVNL3RouterPlugin' %} {% endif %} -service_plugins ={{ l3_plugin }}, neutron.services.metering.metering_plugin.MeteringPlugin +service_plugins = {{ server.backend.get('router', l3_plugin)}}, metering {%- if server.lbaas is defined -%},lbaasv2{%- endif -%} {%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%} {%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%} @@ -703,7 +703,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # needs to execute commands in Dom0 in the hypervisor of XenServer, this item # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session # to pass commands to Dom0. (string value) -root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf +#root_helper_daemon = <None> # Seconds between nodes reporting state to server; should be less than # agent_down_time, best if it is half or less than agent_down_time. (floating @@ -2245,3 +2245,8 @@ username = {{ server.identity.user }} password = {{ server.identity.password }} auth_url=http://{{ server.identity.host }}:35357 {%- endif %} + +{%- if server.backend.ovsdb_connection is defined %} +[ovs] +ovsdb_connection = {{ server.backend.ovsdb_connection }} +{%- endif %} diff --git a/neutron/gateway.sls b/neutron/gateway.sls index 81513d8..7ec9b91 100644 --- a/neutron/gateway.sls +++ b/neutron/gateway.sls @@ -32,6 +32,7 @@ neutron_gateway_packages: /etc/neutron/dhcp_agent.ini: file.managed: - source: salt://neutron/files/{{ gateway.version }}/dhcp_agent.ini + - template: jinja - require: - pkg: neutron_gateway_packages