changed structure and file names to .config

Cloudify-PS · Feb 13, 2019 · 7d0c0b1 · 7d0c0b1
1 parent b289e43
commit 7d0c0b1
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 9 deletions.
diff --git a/create-hq.sh → resources/create-hq.sh b/create-hq.sh → resources/create-hq.sh
diff --git a/delete-hq.sh → resources/delete-hq.sh b/delete-hq.sh → resources/delete-hq.sh
diff --git a/vyos-vnf-branch-1-input.txt → resources/vyos-vnf-branch-1-input.txt b/vyos-vnf-branch-1-input.txt → resources/vyos-vnf-branch-1-input.txt
diff --git a/vyos-vnf-branch-2-input.txt → resources/vyos-vnf-branch-2-input.txt b/vyos-vnf-branch-2-input.txt → resources/vyos-vnf-branch-2-input.txt
diff --git a/templates/vyos-vnf-branch-baseline.txt → resources/vyos-vnf-branch-baseline.config b/templates/vyos-vnf-branch-baseline.txt → resources/vyos-vnf-branch-baseline.config
diff --git a/vyos-vnf-branch-input.yaml → resources/vyos-vnf-branch-input.yaml b/vyos-vnf-branch-input.yaml → resources/vyos-vnf-branch-input.yaml
diff --git a/templates/vyos-vnf-branch-vpn-start.txt → resources/vyos-vnf-branch-vpn-start.config b/templates/vyos-vnf-branch-vpn-start.txt → resources/vyos-vnf-branch-vpn-start.config
diff --git a/templates/vyos-vnf-hq-baseline.txt → resources/vyos-vnf-hq-baseline.config b/templates/vyos-vnf-hq-baseline.txt → resources/vyos-vnf-hq-baseline.config
diff --git a/templates/vyos-vnf-hq-vpn-start.txt → resources/vyos-vnf-hq-vpn-start.config b/templates/vyos-vnf-hq-vpn-start.txt → resources/vyos-vnf-hq-vpn-start.config
diff --git a/templates/vyos-vnf-hq-vpn-stop.txt → resources/vyos-vnf-hq-vpn-stop.config b/templates/vyos-vnf-hq-vpn-stop.txt → resources/vyos-vnf-hq-vpn-stop.config
diff --git a/vyos-vnf-branch.yaml b/vyos-vnf-branch.yaml
@@ -1,13 +1,11 @@
 tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
-  - http://www.getcloudify.org/spec/cloudify/4.0.1/types.yaml
+  - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
   - plugin:cloudify-openstack-plugin
-#  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-utilities-plugin/1.2.5/plugin.yaml
 #  - https://raw.githubusercontent.com/MichaelShn/cloudify-utilities-plugin/patch-tmp/plugin.yaml
   - plugin:cloudify-utilities-plugin
 
-
 inputs:
 
   vyos_image_url:
@@ -120,7 +118,7 @@ node_templates:
             terminal_auth: *terminal_auth_hq
             calls:
               - action: config
-              - template: templates/vyos-vnf-hq-vpn-start.txt
+              - template: resources/vyos-vnf-hq-vpn-start.config
                 params:
                   TUNNEL_INTERFACE: { get_input: hq_tunnel_interface }
                   HQ_TUNNEL_ADDRESS: { get_input: hq_tunnel_address }
@@ -133,7 +131,7 @@ node_templates:
             terminal_auth: *terminal_auth_hq
             calls:
               - action: config
-              - template: templates/vyos-vnf-hq-vpn-start.txt
+              - template: resources/vyos-vnf-hq-vpn-start.config
                 params:
                   TUNNEL_INTERFACE: { get_input: hq_tunnel_interface }
               - action: commit
@@ -171,7 +169,7 @@ node_templates:
             terminal_auth: *terminal_auth_branch
             calls:
               - action: config
-              - template: templates/vyos-vnf-branch-vpn-start.txt
+              - template: resources/vyos-vnf-branch-vpn-start.config
                 params:
                   BRANCH_TUNNEL_ADDRESS: { get_input: branch_tunnel_address }
                   BRANCH_TUNNEL_LOCAL_IP: { get_attribute: [vyos_vnf_branch, networks, wan_net, 0] }
@@ -220,7 +218,7 @@ node_templates:
             terminal_auth: *terminal_auth
             calls:
               - action: config
-              - template: templates/vyos-vnf-branch-baseline.txt
+              - template: resources/vyos-vnf-branch-baseline.config
                 params:
                   BRANCH_HOSTNAME: { get_input: branch_hostname }
                   BRANCH_LAN_ADDRESS: { get_attribute: [vyos_vnf_branch, networks, { get_input: branch_lan_name }, 0] }

diff --git a/vyos-vnf-hq-baseline.yaml b/vyos-vnf-hq-baseline.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
-  - http://www.getcloudify.org/spec/cloudify/4.0.1/types.yaml
+  - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
   - plugin:cloudify-openstack-plugin
 #  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-utilities-plugin/1.2.5/plugin.yaml
 #  - https://raw.githubusercontent.com/MichaelShn/cloudify-utilities-plugin/patch-tmp/plugin.yaml
@@ -62,7 +62,7 @@ node_templates:
             terminal_auth: *terminal_auth
             calls:
               - action: config
-              - template: templates/vyos-vnf-hq-baseline.txt
+              - template: resources/vyos-vnf-hq-baseline.config
               - action: commit
               - action: save
     relationships: