Skip to content

Commit

Permalink
Merge pull request #306 from cloudify-cosmo/CY-1463-fix-server-ip-for…
Browse files Browse the repository at this point in the history
…-multiple-ports

CY-1463: Fix major issue for port/networks ordering attached to serve…
  • Loading branch information
EarthmanT authored Jul 17, 2019
2 parents 021625c + 67b7729 commit 4f4684c
Show file tree
Hide file tree
Showing 32 changed files with 309 additions and 247 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
3.2.2:
- Fix major issue with ports/network ordering connected server instance
3.2.1:
- Expose external resource property as runtime property for external resource
- Update compat module for external resources
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/boot-volumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml


inputs:
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/external_missing_network_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/external_network_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/flavor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:
openstack_username:
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/host_aggregate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:
openstack_username:
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/keypair.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:
openstack_username:
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/network_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/network_rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:
openstack_username:
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/router_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/router_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/router_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/router_4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/router_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/routes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/security_group_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/security_group_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/security_group_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/security_group_4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
4 changes: 2 additions & 2 deletions examples/2.x/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand All @@ -23,7 +23,7 @@ inputs:
default: { get_secret: region }

external_network_name:
default: { get_input: external_network_name }
type: string

network_id:
type: string
Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/server_floating_ip_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/server_group.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/server_security_group_connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/user.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
2 changes: 1 addition & 1 deletion examples/2.x/volume.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:cloudify-openstack-plugin
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml

inputs:

Expand Down
Loading

0 comments on commit 4f4684c

Please sign in to comment.