Merge "Correct property accessibility for classes in Instance hierarchy"
This commit is contained in:
commit
fb9026accc
meta/io.murano/Classes/resources
@ -12,10 +12,11 @@ Workflow:
|
|||||||
- groupName:
|
- groupName:
|
||||||
Contract: $.string().notNull()
|
Contract: $.string().notNull()
|
||||||
Body:
|
Body:
|
||||||
|
- $environment: $.find(std:Environment).require()
|
||||||
- $rules:
|
- $rules:
|
||||||
- ToPort: 22
|
- ToPort: 22
|
||||||
IpProtocol: tcp
|
IpProtocol: tcp
|
||||||
FromPort: 22
|
FromPort: 22
|
||||||
External: true
|
External: true
|
||||||
- $.environment.securityGroupManager.addGroupIngress(
|
- $environment.securityGroupManager.addGroupIngress(
|
||||||
rules => $rules, groupName => $groupName)
|
rules => $rules, groupName => $groupName)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
Namespaces:
|
Namespaces:
|
||||||
=: io.murano.resources
|
=: io.murano.resources
|
||||||
|
sys: io.murano.system
|
||||||
std: io.murano
|
std: io.murano
|
||||||
|
|
||||||
Name: LinuxMuranoInstance
|
Name: LinuxMuranoInstance
|
||||||
@ -10,8 +11,10 @@ Extends:
|
|||||||
Workflow:
|
Workflow:
|
||||||
prepareUserData:
|
prepareUserData:
|
||||||
Body:
|
Body:
|
||||||
- $configFile: $.resources.string('Agent-v2.template')
|
- $environment: $.find(std:Environment).require()
|
||||||
- $initScript: $.resources.string('linux-init.sh')
|
- $resources: new(sys:Resources)
|
||||||
|
- $configFile: $resources.string('Agent-v2.template')
|
||||||
|
- $initScript: $resources.string('linux-init.sh')
|
||||||
- $configReplacements:
|
- $configReplacements:
|
||||||
"%RABBITMQ_HOST%": config(rabbitmq, host)
|
"%RABBITMQ_HOST%": config(rabbitmq, host)
|
||||||
"%RABBITMQ_PORT%": config(rabbitmq, port)
|
"%RABBITMQ_PORT%": config(rabbitmq, port)
|
||||||
@ -20,7 +23,7 @@ Workflow:
|
|||||||
"%RABBITMQ_VHOST%": config(rabbitmq, virtual_host)
|
"%RABBITMQ_VHOST%": config(rabbitmq, virtual_host)
|
||||||
"%RABBITMQ_SSL%": str(config(rabbitmq, ssl)).toLower()
|
"%RABBITMQ_SSL%": str(config(rabbitmq, ssl)).toLower()
|
||||||
"%RABBITMQ_INPUT_QUEUE%": $.agent.queueName()
|
"%RABBITMQ_INPUT_QUEUE%": $.agent.queueName()
|
||||||
"%RESULT_QUEUE%": $.environment.agentListener.queueName()
|
"%RESULT_QUEUE%": $environment.agentListener.queueName()
|
||||||
- $scriptReplacements:
|
- $scriptReplacements:
|
||||||
"%AGENT_CONFIG_BASE64%": base64encode($configFile.replace($configReplacements))
|
"%AGENT_CONFIG_BASE64%": base64encode($configFile.replace($configReplacements))
|
||||||
"%INTERNAL_HOSTNAME%": $.name
|
"%INTERNAL_HOSTNAME%": $.name
|
||||||
|
@ -12,18 +12,21 @@ Workflow:
|
|||||||
- groupName:
|
- groupName:
|
||||||
Contract: $.string().notNull()
|
Contract: $.string().notNull()
|
||||||
Body:
|
Body:
|
||||||
|
- $environment: $.find(std:Environment).require()
|
||||||
- $rules:
|
- $rules:
|
||||||
- ToPort: 3389
|
- ToPort: 3389
|
||||||
IpProtocol: tcp
|
IpProtocol: tcp
|
||||||
FromPort: 3389
|
FromPort: 3389
|
||||||
External: true
|
External: true
|
||||||
- $.environment.securityGroupManager.addGroupIngress(
|
- $environment.securityGroupManager.addGroupIngress(
|
||||||
rules => $rules, groupName => $groupName)
|
rules => $rules, groupName => $groupName)
|
||||||
|
|
||||||
prepareUserData:
|
prepareUserData:
|
||||||
Body:
|
Body:
|
||||||
- $configFile: $.resources.string('Agent-v1.template')
|
- $resources: new(sys:Resources)
|
||||||
- $initScript: $.resources.string('windows-init.ps1')
|
- $environment: $.find(std:Environment).require()
|
||||||
|
- $configFile: $resources.string('Agent-v1.template')
|
||||||
|
- $initScript: $resources.string('windows-init.ps1')
|
||||||
- $configReplacements:
|
- $configReplacements:
|
||||||
"%RABBITMQ_HOST%": config(rabbitmq, host)
|
"%RABBITMQ_HOST%": config(rabbitmq, host)
|
||||||
"%RABBITMQ_PORT%": config(rabbitmq, port)
|
"%RABBITMQ_PORT%": config(rabbitmq, port)
|
||||||
@ -32,7 +35,7 @@ Workflow:
|
|||||||
"%RABBITMQ_VHOST%": config(rabbitmq, virtual_host)
|
"%RABBITMQ_VHOST%": config(rabbitmq, virtual_host)
|
||||||
"%RABBITMQ_SSL%": str(config(rabbitmq, ssl)).toLower()
|
"%RABBITMQ_SSL%": str(config(rabbitmq, ssl)).toLower()
|
||||||
"%RABBITMQ_INPUT_QUEUE%": $.agent.queueName()
|
"%RABBITMQ_INPUT_QUEUE%": $.agent.queueName()
|
||||||
"%RESULT_QUEUE%": $.environment.agentListener.queueName()
|
"%RESULT_QUEUE%": $environment.agentListener.queueName()
|
||||||
- $scriptReplacements:
|
- $scriptReplacements:
|
||||||
"%AGENT_CONFIG_BASE64%": base64encode($configFile.replace($configReplacements))
|
"%AGENT_CONFIG_BASE64%": base64encode($configFile.replace($configReplacements))
|
||||||
"%INTERNAL_HOSTNAME%": $.name
|
"%INTERNAL_HOSTNAME%": $.name
|
||||||
|
Loading…
x
Reference in New Issue
Block a user