added env var

docker-compose/docker-compose.yml

@@ -90,6 +90,8 @@ services:
     environment:
       RABBITMQ_HOST: rabbit      
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+      CLOUD_STORM_SECRET: 456
+      CREDENTIAL_SECRET: 123      
     
   deployer:
     depends_on:
@@ -99,9 +101,8 @@ services:
     environment:
       RABBITMQ_HOST: rabbit           
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-      SEMAPHORE_BASE_PATH: http://semaphore:3000/api   
-      CREDENTIAL_SECRET: 123
-      ENCRYPTION_PASSWORD: 456
+      SEMAPHORE_BASE_PATH: http://semaphore:3000/api
+      
           
       
 

k8s/CONF/deployer-deployment.yaml

@@ -34,9 +34,7 @@ spec:
         - name: SURE_TOSCA_BASE_PATH
           value: http://sure-tosca:8081/tosca-sure/1.0.0
         - name: SEMAPHORE_BASE_PATH
-          value: http://semaphore:3000/api     
-        - name: CREDENTIAL_SECRET
-          value: top_secret          
+          value: http://semaphore:3000/api                    
         image: qcdis/deployer:3.0.0
         name: deployer
         imagePullPolicy: Always

k8s/CONF/deployer-deployment.yaml.template → k8s/CONF/provisioner-deployment.yaml.template

@@ -7,12 +7,12 @@ metadata:
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
-    io.kompose.service: deployer
-  name: deployer
+    io.kompose.service: provisioner
+  name: provisioner
 spec:
   selector:
     matchLabels:
-      io.kompose.service: deployer
+      io.kompose.service: provisioner
   replicas: 1
   strategy:
         type: RollingUpdate
@@ -25,7 +25,7 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: deployer
+        io.kompose.service: provisioner
     spec:
       containers:
       - env:
@@ -33,14 +33,8 @@ spec:
           value: rabbit
         - name: SURE_TOSCA_BASE_PATH
           value: http://sure-tosca:8081/tosca-sure/1.0.0
-        - name: SEMAPHORE_BASE_PATH
-          value: http://semaphore:3000/api     
-        - name: CREDENTIAL_SECRET
-          value: top_secret          
-        - name: ENCRYPTION_PASSWORD
-          value: top_secret             
-        image: qcdis/deployer:3.0.0
-        name: deployer
+        image: qcdis/provisioner:3.0.0
+        name: provisioner
         imagePullPolicy: Always
         resources: {}
       restartPolicy: Always

provisioner/Dockerfile

@@ -6,8 +6,8 @@ CMD jar -xf provisioner-3.0.0-jar-with-dependencies.jar application.properties &
     cat application.properties && \
     sed -ie "s#^message.broker.host=.*#message.broker.host=$RABBITMQ_HOST#" application.properties && \ 
     sed -ie "s#^sure-tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" application.properties && \
-    sed -ie "s#^cloud.storm.secret=.*#cloud.storm.secret=$ENCRYPTION_PASSWORD#" application.properties && \
     sed -ie "s#^cloud.storm.db.path=.*#cloud.storm.db.path=/etc/UD#" application.properties && \
+    sed -ie "s#^cloud.storm.secret=.*#cloud.storm.secret=$CLOUD_STORM_SECRET#" application.properties && \
     sed -ie "s#^credential.secret=.*#credential.secret=$CREDENTIAL_SECRET#" application.properties && \
     cat application.properties && \
     jar -uf provisioner-3.0.0-jar-with-dependencies.jar application.properties && \