Skip to content

Commit

Permalink
Merge pull request #195 from cloudify-cosmo/RD-2472-Cluster-Name
Browse files Browse the repository at this point in the history
RD 2472 __NODOCS__
  • Loading branch information
EarthmanT authored May 26, 2021
2 parents b7dc1ce + 7793939 commit f82f5ef
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
3.3.1: RD-2472 - cluster_name property maintained for forward compatibility.
3.3.0: Add create_if_missing for all azure resources.
3.2.1: Fix bug, fail if trying to use external resource that doesn't exist.
3.2.0: Add pull operation for Azure ARM deployment.
Expand Down
5 changes: 5 additions & 0 deletions cloudify_azure/resources/compute/managed_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ def get_manged_cluster_interface(ctx):
@decorators.with_azure_resource(ManagedCluster)
def create(ctx, resource_group, cluster_name, resource_config, **_):
managed_cluster = get_manged_cluster_interface(ctx)
if ctx.node.properties.get('cluster_name'):
ctx.logger.warn(
'The cluster_name is deprecated, but was provided. '
'Update your blueprint to use the "name" property, '
'which replaces "cluster_name".')
resource_config_payload = {}
resource_config_payload = \
utils.handle_resource_config_params(resource_config_payload,
Expand Down
8 changes: 6 additions & 2 deletions plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
plugins:
azure:
executor: central_deployment_agent
source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/3.3.0.zip
source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/3.3.1.zip
package_name: cloudify-azure-plugin
package_version: '3.3.0'
package_version: '3.3.1'

data_types:
cloudify.datatypes.azure.Config:
Expand Down Expand Up @@ -1700,6 +1700,10 @@ node_types:
name:
required: true
type: string
default: { get_property: [ SELF, cluster_name ] }
cluster_name:
required: false
type: string
resource_config:
type: cloudify.datatypes.azure.compute.ManagedClusterConfig
required: true
Expand Down

0 comments on commit f82f5ef

Please sign in to comment.