diff options
| -rw-r--r-- | README.rst | 6 | ||||
| -rw-r--r-- | yardstick/orchestrator/heat.py | 17 |
2 files changed, 18 insertions, 5 deletions
diff --git a/README.rst b/README.rst index c6ff99185..76ea9723c 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ service performance to be within a certain level of agreement. For more information on Yardstick project, please visit: https://wiki.opnfv.org/display/yardstick/Yardstick - http://artifacts.opnfv.org/yardstick/colorado/3.0/docs/userguide/index.html#document-01-introduction + http://artifacts.opnfv.org/yardstick/docs/userguide/index.html#document-01-introduction Architecture @@ -42,7 +42,7 @@ records to a file. For more information on Yardstick architecture, please read: - http://artifacts.opnfv.org/yardstick/colorado/3.0/docs/userguide/index.html#document-03-architecture + http://artifacts.opnfv.org/yardstick/docs/userguide/index.html#document-03-architecture Installation @@ -53,7 +53,7 @@ Yardstick supports installation on Ubuntu 14.04 or via a Docker image. To learn how to install Yardstick, consult the documentation available online at: - http://artifacts.opnfv.org/yardstick/colorado/3.0/docs/userguide/index.html#document-07-installation + http://artifacts.opnfv.org/yardstick/docs/userguide/index.html#document-09-installation Developers diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index 89785ee0e..d58ae5618 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -497,7 +497,7 @@ name (i.e. %s).\ 'type': 'OS::Neutron::SecurityGroup', 'properties': { 'name': name, - 'description': "Group allowing icmp and upd/tcp on all ports", + 'description': "Group allowing IPv4 and IPv6 for icmp and upd/tcp on all ports", 'rules': [ {'remote_ip_prefix': '0.0.0.0/0', 'protocol': 'tcp', @@ -508,7 +508,20 @@ name (i.e. %s).\ 'port_range_min': '1', 'port_range_max': '65535'}, {'remote_ip_prefix': '0.0.0.0/0', - 'protocol': 'icmp'} + 'protocol': 'icmp'}, + {'remote_ip_prefix': '::/0', + 'ethertype': 'IPv6', + 'protocol': 'tcp', + 'port_range_min': '1', + 'port_range_max': '65535'}, + {'remote_ip_prefix': '::/0', + 'ethertype': 'IPv6', + 'protocol': 'udp', + 'port_range_min': '1', + 'port_range_max': '65535'}, + {'remote_ip_prefix': '::/0', + 'ethertype': 'IPv6', + 'protocol': 'ipv6-icmp'} ] } } |