Merge "Allow the endpoint_type for service net creation to be specified."

openstack/openstack-ansible-os_trove

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2017年06月07日 20:56:40 +00:00

committed by Gerrit Code Review

parent 58f6bc8c84 7bfa684eb9

commit b6b933df6f

3 changed files with 10 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml

View File

@@ -163,6 +163,7 @@ trove_service_net_subnet_cidr: "192.168.20.0/24"

trove_service_net_dhcp:"True"

trove_service_net_allocation_pool_start:"192.168.20.100"

trove_service_net_allocation_pool_end:"192.168.20.120"

trove_service_net_endpoint_type:internal

# RPC encryption keys

# See the Trove documentation as to the significance of the rpc encryption keys

7
releasenotes/notes/service_net_endpoint_type-60dbb87c4f68403c.yaml Normal file

View File

@@ -0,0 +1,7 @@

---

features:

- You can set the ``endpoint_type`` used when

creating the Trove service network by specifying

the ``trove_service_net_endpoint_type`` variable.

This will default to ``internal``. Other possible

options are ``public`` and ``admin``.

2
tasks/trove_service_network.yml

View File

@@ -37,6 +37,7 @@

provider_network_type:"{{ trove_service_net_type }}"

project:"{{ keystone_admin_tenant_id }}"

wait:yes

endpoint_type:"{{ trove_service_net_endpoint_type }}"

register:trove_network

run_once:true

@@ -53,6 +54,7 @@

enable_dhcp:"{{ trove_service_net_dhcp }}"

project:"{{ keystone_admin_tenant_id }}"

wait:yes

endpoint_type:"{{ trove_service_net_endpoint_type }}"

register:subnet_create

run_once:true

# Block end