Merge pull request #26 from Vladimir-Antonovich/master

Add cloudify user, change rocky image id, fix sshd and iptables
Cloudify-PS · Feb 5, 2019 · b69ee82 · b69ee82
2 parents 6fb4a64 + 143ffc6
commit b69ee82
Show file tree

Hide file tree

Showing 6 changed files with 1,154 additions and 1,141 deletions.
diff --git a/CFY44_OIB_rocky.yaml b/CFY44_OIB_rocky.yaml
@@ -43,7 +43,8 @@ inputs:
 
   oib_image_id:
     type: string
-    default: { get_secret : OIB_Rocky_ImageID }  # OIB-rocky-v1
+
+    default: { get_secret : OIB_Rocky_ImageID }  # OIB-rocky-v1.1
 
   oib_flavor_id:
     type: string

diff --git a/CFY44_rocky_Vanilla.yaml b/CFY44_rocky_Vanilla.yaml
@@ -1,54 +1,54 @@
-tosca_definitions_version: cloudify_dsl_1_3
-
-imports:
-  - CFY44_OIB_rocky.yaml
-
-
-
-outputs:
-
-  integration:
-    value:
-      manager: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }
-      composer: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/composer" ] }
-      iaas_dash: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }
-      vpn_file:  { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/vpn/client.ovpn" ] }
-      ssh_ip:  { get_attribute: [ lab_floating_ip, floating_ip_address ] }
-      ssh_user: "centos"
-
-  lab_env:
-    description: OpenStack Cloudify Lab
-    value:
-      video: https://www.youtube.com/embed/psJhdw78kkw
-      suspend: false
-
-  lab_ui_outputs:
-    value:
-      - title: 'Cloudify Manager'
-        open: yes
-        items:
-          - name: 'Cloudify Manager Credentials'
-            value: 'username: admin password: admin'
-          - name: 'Cloudify Manager Link'
-            value: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/" ] }
-          - name: 'CLI command'
-            value: { concat: ["cfy profiles use " , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, " -u admin -p admin -t default_tenant" ] }
-
-
-      - title: 'VPN Configuration'
-        open: no
-        items:
-          - name: 'OpenVpn Configuration File'
-            value: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/vpn/client.ovpn" ] }
-          - name: 'VPN Portal'
-            value:  { get_attribute: [ lab_floating_ip, floating_ip_address ] }
-          - name: 'VPN Configuration Guide'
-            value: 'https://cloudify.co/knowledge-base/cloudify-labs-vpn-configuration-guide/'
-
-      - title: 'Lab OpenStack IaaS'
-        open: no
-        items:
-          - name: 'OpenStack Dashboard Credentials'
-            value: 'username: admin password: cloudify1234'
-          - name: 'OpenStack Dashboard'
-            value:  { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+  - CFY44_OIB_rocky.yaml
+
+
+
+outputs:
+
+  integration:
+    value:
+      manager: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }
+      composer: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/composer" ] }
+      iaas_dash: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }
+      vpn_file:  { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/vpn/client.ovpn" ] }
+      ssh_ip:  { get_attribute: [ lab_floating_ip, floating_ip_address ] }
+      ssh_user: "centos"
+
+  lab_env:
+    description: OpenStack Cloudify Lab
+    value:
+      video: https://www.youtube.com/embed/psJhdw78kkw
+      suspend: false
+
+  lab_ui_outputs:
+    value:
+      - title: 'Cloudify Manager'
+        open: yes
+        items:
+          - name: 'Cloudify Manager Credentials'
+            value: 'username: admin password: admin'
+          - name: 'Cloudify Manager Link'
+            value: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/" ] }
+          - name: 'CLI command'
+            value: { concat: ["cfy profiles use " , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, " -u admin -p admin -t default_tenant" ] }
+
+
+      - title: 'VPN Configuration'
+        open: no
+        items:
+          - name: 'OpenVpn Configuration File'
+            value: { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/vpn/client.ovpn" ] }
+          - name: 'VPN Portal'
+            value:  { get_attribute: [ lab_floating_ip, floating_ip_address ] }
+          - name: 'VPN Configuration Guide'
+            value: 'https://cloudify.co/knowledge-base/cloudify-labs-vpn-configuration-guide/'
+
+      - title: 'Lab OpenStack IaaS'
+        open: no
+        items:
+          - name: 'OpenStack Dashboard Credentials'
+            value: 'username: admin password: cloudify1234'
+          - name: 'OpenStack Dashboard'
+            value:  { concat: ["http://" , { get_attribute: [ lab_floating_ip, floating_ip_address ] }, "/dashboard" ] }