added mongo-express

deployer/service/ansible_service.py

@@ -62,16 +62,14 @@ class AnsibleService:
                             environment_id = self.semaphore_helper.create_environment(project_id, name, env_vars)
                         arguments = None
                         if application.name == 'gluster_fs' or application.name == 'glusterfs' or application.name == 'tic':
-                            arguments = '["-u","vm_user"]'
-                            if playbook_name == '013.mount_fs.yml' or playbook_name == '002.setup_glusterfs_infra.yml':
-                                for vm in vms:
-                                    attributes = vm.node_template.attributes
-                                    if attributes['role'] == 'master':
-                                        master_ip = attributes['public_ip']
-                                        break
-                                arguments = '["-u","vm_user","--extra-vars","gluster_cluster_host0=\'' + master_ip \
-                                            + '\' gluster_cluster_volume=\'gfs0\' devmode=\'false\' ' \
-                                              'device_path=\'/dev/xvdh\' gfs_size=\'15G\'"]'
+                            for vm in vms:
+                                attributes = vm.node_template.attributes
+                                if attributes['role'] == 'master':
+                                    master_ip = attributes['public_ip']
+                                    break
+                            arguments = '["-u","vm_user","--extra-vars","gluster_cluster_host0=\'' + master_ip \
+                                        + '\' gluster_cluster_volume=\'gfs0\' devmode=\'false\' ' \
+                                          'device_path=\'/dev/xvdh\' gfs_size=\'15G\'"]'
                         task_id = self.run_task(name, project_id, key_id, git_url, inventory_id, playbook_name,
                                                 environment_id=environment_id, arguments=arguments)
                         count = 0

docker-compose/docker-compose-test.yml

 version: '3'
 services:
 
-  nginx:
-    image: nginx
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-      - ./cert.pem:/etc/nginx/cert.pem
-      - ./privkey.pem:/etc/nginx/privkey.pem
-      #- ./www:/data/www
-    ports:
-    - "80:80"
-    - "443:443"
+  #nginx:
+    #image: nginx
+    #volumes:
+      #- ./nginx.conf:/etc/nginx/nginx.conf
+      #- ./cert.pem:/etc/nginx/cert.pem
+      #- ./privkey.pem:/etc/nginx/privkey.pem
+      ##- ./www:/data/www
+    #ports:
+    #- "80:80"
+    #- "443:443"
     
-  rabbit:
-    image: rabbitmq:3.8-management
-    ports:   
-      - "5671-5672:5671-5672"
-      - "15672:15672"
-      - "4369:4369"
-      - "15671:15671"     
+  #rabbit:
+    #image: rabbitmq:3.8-management
+    #ports:   
+      #- "5671-5672:5671-5672"
+      #- "15672:15672"
+      #- "4369:4369"
+      #- "15671:15671"     
 
   mysql:
     image: mysql:5.7
@@ -49,18 +49,18 @@ services:
     depends_on:
       - mysql
       
-  mongo:
-    image: mongo:4
-    ports:
-      - "27017:27017"               
+  #mongo:
+    #image: mongo:4
+    #ports:
+      #- "27017:27017"               
     
       
   
             
-  sure-tosca:
-    image: qcdis/sure-tosca
-    ports: 
-      - "8081:8081"
+  #sure-tosca:
+    #image: qcdis/sure-tosca
+    #ports: 
+      #- "8081:8081"
     
 
       

docker-compose/docker-compose.yml

 version: '3'
 services:
 
-  nginx:
-    image: nginx
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-      - ./cert.pem:/etc/nginx/cert.pem
-      - ./privkey.pem:/etc/nginx/privkey.pem
-      #- ./www:/data/www
-    ports:
-    - "80:80"
-    - "443:443"
+  #nginx:
+    #image: nginx
+    #volumes:
+      #- ./nginx.conf:/etc/nginx/nginx.conf
+      #- ./cert.pem:/etc/nginx/cert.pem
+      #- ./privkey.pem:/etc/nginx/privkey.pem
+      ##- ./www:/data/www
+    #ports:
+    #- "80:80"
+    #- "443:443"
     
-  rabbit:
-    image: rabbitmq:3.8-management
-    ports:   
-      - "5671-5672:5671-5672"
-      - "15672:15672"
-      - "4369:4369"
-      - "15671:15671"     
+  #rabbit:
+    #image: rabbitmq:3.8-management
+    #ports:   
+      #- "5671-5672:5671-5672"
+      #- "15672:15672"
+      #- "4369:4369"
+      #- "15671:15671"     
 
-  mysql:
-    image: mysql:5.7
-    volumes:    
-        - ./mysql.cnf:/etc/mysql/mysql.conf.d/mysqld.cnf
-    environment:
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
-      MYSQL_DATABASE: semaphore
-      MYSQL_USER: semaphore
-      MYSQL_PASSWORD: semaphore
-    #ports:
-      #- "3306:3306"
+  #mysql:
+    #image: mysql:5.7
+    #volumes:    
+        #- ./mysql.cnf:/etc/mysql/mysql.conf.d/mysqld.cnf
+    #environment:
+      #MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      #MYSQL_DATABASE: semaphore
+      #MYSQL_USER: semaphore
+      #MYSQL_PASSWORD: semaphore
+    ##ports:
+      ##- "3306:3306"
       
-  semaphore:
-    image: qcdis/docker_ansible_semaphore
-    environment:
-      SEMAPHORE_DB_USER: semaphore
-      SEMAPHORE_DB_PASS: semaphore
-      SEMAPHORE_DB_HOST: mysql
-      SEMAPHORE_DB_PORT: 3306
-      SEMAPHORE_DB: semaphore
-      SEMAPHORE_PLAYBOOK_PATH: /etc/semaphore
-      SEMAPHORE_ADMIN_PASSWORD: password
-      SEMAPHORE_ADMIN_NAME: "Developer"
-      SEMAPHORE_ADMIN_EMAIL: admin@localhost
-      SEMAPHORE_ADMIN: admin
-      SEMAPHORE_WEB_ROOT: http://0.0.0.0:3000
-    ports:
-      - "3000:3000"
-    depends_on:
-      - mysql
+  #semaphore:
+    #image: qcdis/docker_ansible_semaphore
+    #environment:
+      #SEMAPHORE_DB_USER: semaphore
+      #SEMAPHORE_DB_PASS: semaphore
+      #SEMAPHORE_DB_HOST: mysql
+      #SEMAPHORE_DB_PORT: 3306
+      #SEMAPHORE_DB: semaphore
+      #SEMAPHORE_PLAYBOOK_PATH: /etc/semaphore
+      #SEMAPHORE_ADMIN_PASSWORD: password
+      #SEMAPHORE_ADMIN_NAME: "Developer"
+      #SEMAPHORE_ADMIN_EMAIL: admin@localhost
+      #SEMAPHORE_ADMIN: admin
+      #SEMAPHORE_WEB_ROOT: http://0.0.0.0:3000
+    #ports:
+      #- "3000:3000"
+    #depends_on:
+      #- mysql
       
   mongo:
     image: mongo:4
     ports:
-      - "27017:27017"               
-    
+      - "27017:27017"  
       
-  manager:
-    depends_on:
-      - rabbit
-      - mongo
-      - sure-tosca
-    image: qcdis/manager 
+  mongo-express:
+    image: mongo-express
     environment:
-      RABBITMQ_HOST: rabbit
-      MONGO_HOST: mongo
-      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-      CREDENTIAL_SECRET: 123
+        - ME_CONFIG_MONGODB_SERVER=mongo
+        - ME_CONFIG_MONGODB_PORT=27017
+        - ME_CONFIG_BASICAUTH_USERNAME=user
+        - ME_CONFIG_BASICAUTH_PASSWORD=pass
+        - ME_CONFIG_SITE_BASEURL=/mongo-express
+        - VCAP_APP_PORT=8082
+    depends_on:
+        - mongo
     ports:
-      - "8080:8080"       
+        - "8082:8082"      
+    
+      
+  #manager:
+    #depends_on:
+      #- rabbit
+      #- mongo
+      #- sure-tosca
+    #image: qcdis/manager 
+    #environment:
+      #RABBITMQ_HOST: rabbit
+      #MONGO_HOST: mongo
+      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+      #CREDENTIAL_SECRET: top_secret
+    #ports:
+      #- "8080:8080"       
             
-  sure-tosca:
-    image: qcdis/sure-tosca
-    ports: 
-      - "8081:8081"
+  #sure-tosca:
+    #image: qcdis/sure-tosca
+    #ports: 
+      #- "8081:8081"
     
-  planner:
-    depends_on:
-      - rabbit
-      - sure-tosca
-    image: qcdis/planner 
-    environment:
-      RABBITMQ_HOST: rabbit
+  #planner:
+    #depends_on:
+      #- rabbit
+      #- sure-tosca
+    #image: qcdis/planner 
+    #environment:
+      #RABBITMQ_HOST: rabbit
     
-  provisioner:
-    depends_on:
-      - rabbit
-      - sure-tosca
-    image: qcdis/provisioner 
-    environment:
-      RABBITMQ_HOST: rabbit      
-      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-      CLOUD_STORM_SECRET: 456
-      CREDENTIAL_SECRET: 123
+  #provisioner:
+    #depends_on:
+      #- rabbit
+      #- sure-tosca
+    #image: qcdis/provisioner 
+    #environment:
+      #RABBITMQ_HOST: rabbit      
+      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+      #CLOUD_STORM_SECRET: 456
+      #CREDENTIAL_SECRET: top_secret
     
   #deployer:
     #depends_on:

docker-compose/nginx.conf

@@ -96,6 +96,12 @@ http {
 
       proxy_buffering off;
       proxy_request_buffering off;
-    }      
+    }
+    
+	location /mongo-express {
+		proxy_pass		http://mongo-express:8082;
+		proxy_set_header	Host		$host;
+		proxy_set_header	X-Real_IP	$remote_addr;
+	}     
   }
 }

k8s/CONF/DBs/mongo-express-deployment.yaml

+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  namespace: conf
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.16.0 (0c01309)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: mongo-express
+  name: mongo-express
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: mongo-express
+    spec:
+      containers:
+      - env:
+        - name: ME_CONFIG_BASICAUTH_PASSWORD
+          value: pass
+        - name: ME_CONFIG_BASICAUTH_USERNAME
+          value: user
+        - name: ME_CONFIG_MONGODB_PORT
+          value: "27017"
+        - name: ME_CONFIG_MONGODB_SERVER
+          value: mongo
+        - name: ME_CONFIG_SITE_BASEURL
+          value: /mongo-express
+        - name: VCAP_APP_PORT
+          value: "8082"
+        image: mongo-express
+        name: mongo-express
+        ports:
+        - containerPort: 8082
+        resources: {}
+      restartPolicy: Always
+status: {}

k8s/CONF/DBs/mongo-express-service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  namespace: conf
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.16.0 (0c01309)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: mongo-express
+  name: mongo-express
+spec:
+  ports:
+  - name: "8082"
+    port: 8082
+    targetPort: 8082
+  selector:
+    io.kompose.service: mongo-express
+status:
+  loadBalancer: {}

manager/src/main/java/nl/uva/sne/drip/api/ToscaTemplateApiController.java

@@ -131,7 +131,7 @@ public class ToscaTemplateApiController implements ToscaTemplateApi {
 //        String accept = request.getHeader("Accept");
 //        if (accept != null && accept.contains("application/json")) {
             List<String> ids = toscaTemplateService.getAllIds();
-            return new ResponseEntity<>(ids, HttpStatus.NOT_IMPLEMENTED);
+            return new ResponseEntity<>(ids, HttpStatus.OK);
 //        } else {
 //            return new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE);
 //        }