added mount disk for ec2

TOSCA/types/nodes.yaml

@@ -179,7 +179,7 @@ node_types:
       disk_size:
         type: scalar-unit.size
         required: true
-        default: 30000 MB
+        default: 40000 MB
         constraints:
           - greater_or_equal: 15000 MB
       mem_size:

ansible_playbooks/install_k8s.yml

@@ -18,7 +18,6 @@
         - lock-frontend
   
     - name: Update and upgrade apt packages
-      become: true
       apt:
         upgrade: yes
         update_cache: yes
@@ -41,6 +40,46 @@
         - python-pip      
         - virtualenv
         
+        
+
+    - name: Check that the /dev/xvdh exists
+      stat:
+        path: /dev/xvdh
+      register: mount_volume
+      
+    - debug:
+        msg: "/dev/xvdh exists"
+      when: mount_volume.stat.exists
+        
+    - name: Create a xfs
+      filesystem:
+        fstype: xfs
+        dev: /dev/xvdh
+      when: mount_volume.stat.exists == True 
+    
+    
+    - name: Creates directory
+      file:
+        path: /data
+        state: directory
+      when: mount_volume.stat.exists == True         
+    
+
+    - name: Mount 
+      mount:
+        path: /data
+        src: /dev/xvdh
+        state: present
+        fstype: xfs
+      when: mount_volume.stat.exists == True         
+
+        
+    - name: Change data-root location in /etc/docker/daemon.json
+      shell: |
+        echo '{"data-root": "/data"}' > /etc/docker/daemon.json
+      when: mount_volume.stat.exists == True
+      
+    
     - name: Add Docker GPG apt Key
       apt_key:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -56,7 +95,6 @@
       apt: update_cache=yes name=docker-ce state=latest           
            
     - name: Update and upgrade apt packages
-      become: true
       apt:
         upgrade: yes
         update_cache: yes

bin/dockerize.sh

@@ -10,13 +10,16 @@ cd provisioner && mvn -Dmaven.test.skip=true dockerfile:build
 [ $status -eq 0 ] && echo "build successful" || exit -1
 cd ../
 echo "----------Building sure_tosca-flask-server Docker--------------"
-cd sure_tosca-flask-server && docker build -t alogo53/sure-tosca:3.0.0 .
+# cd sure_tosca-flask-server && docker build -t alogo53/sure-tosca:3.0.0 .
+cd sure_tosca-flask-server && docker build -t sure-tosca:3.0.0 .
 [ $status -eq 0 ] && echo "build successful" || exit -1
 echo "----------Building planner Docker--------------"
 cd ../
-cd planner && docker build -t alogo53/planner:3.0.0 .
+# cd planner && docker build -t alogo53/planner:3.0.0 .
+cd planner && docker build -t planner:3.0.0 .
 [ $status -eq 0 ] && echo "build successful" || exit -1
 echo "----------Building deployer Docker--------------"
 cd ../
-cd deployer && docker build -t alogo53/deployer:3.0.0 .
+# cd deployer && docker build -t alogo53/deployer:3.0.0 .
+cd deployer && docker build -t deployer:3.0.0 .
 [ $status -eq 0 ] && echo "build successful" || exit -1

docker-compose.yml

@@ -108,7 +108,7 @@ services:
       - rabbit
       - mongo
       - sure-tosca
-    image: alogo53/manager:3.0.0
+    image: manager:3.0.0
     environment:
       RABBITMQ_HOST: rabbit
       MONGO_HOST: mongo
@@ -117,7 +117,7 @@ services:
       - "30000:8080"       
             
   sure-tosca:
-    image: alogo53/sure-tosca:3.0.0
+    image: sure-tosca:3.0.0
     ports: 
       - "8081:8081"
     
@@ -125,24 +125,24 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: alogo53/planner:3.0.0
+    image: planner:3.0.0
     environment:
       RABBITMQ_HOST: rabbit
     
-  #provisioner:
-    #depends_on:
-      #- rabbit
-      #- sure-tosca
-    #image: alogo53/provisioner:3.0.0
-    #environment:
-      #RABBITMQ_HOST: rabbit      
-      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+  provisioner:
+    depends_on:
+      - rabbit
+      - sure-tosca
+    image: provisioner:3.0.0
+    environment:
+      RABBITMQ_HOST: rabbit      
+      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
     
   deployer:
     depends_on:
       - rabbit
       - sure-tosca
-    image: alogo53/deployer:3.0.0
+    image: deployer:3.0.0
     environment:
       RABBITMQ_HOST: rabbit           
 

manager/pom.xml

@@ -36,8 +36,8 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <version>1.4.13</version>
                 <configuration>
-                                        <repository>${docker.image.prefix}/${project.artifactId}</repository>
-                    <!--<repository>${project.artifactId}</repository>-->
+                    <!--<repository>${docker.image.prefix}/${project.artifactId}</repository>-->
+                    <repository>${project.artifactId}</repository>
                     <tag>${project.version}</tag>
                 </configuration>
             </plugin>

provisioner/pom.xml

@@ -113,8 +113,8 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <version>1.4.13</version>
                 <configuration>
-                    <repository>${docker.image.prefix}/${project.artifactId}</repository>
-                    <!--<repository>${project.artifactId}</repository>-->
+                    <!--<repository>${docker.image.prefix}/${project.artifactId}</repository>-->
+                    <repository>${project.artifactId}</repository>
                     <tag>${project.version}</tag>
                 </configuration>
             </plugin>