no show pw now

sciabarracom · Oct 20, 2017 · 3a7c774 · 3a7c774
1 parent cce3ff4
commit 3a7c774
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/ansible/roles/jenkins/tasks/main.yml b/ansible/roles/jenkins/tasks/main.yml
@@ -1,4 +1,3 @@
 ---
 - include_tasks: docker.yml
 - include_tasks: service.yml
-- include_tasks: show-jenkins-pw.yml
diff --git a/ansible/roles/jenkins/tasks/show-jenkins-pw.yml b/ansible/roles/jenkins/tasks/show-jenkins-pw.yml
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -1,11 +1,13 @@
 version: '3'
 services:
   spark-master:
+    hostname: spark-master
     image: localhost:5000/spark:0.4-1
+    expose: 7077
     ports:
       - "8082:8080"
     networks:
-      - spark-network
+      - loc
     environment:
       SPARK_MASTER_MEMORY: "4g"
       SPARK_MASTER_CORES: 2
@@ -18,12 +20,10 @@ services:
 
   spark-worker:
     image: localhost:5000/spark:0.4-1
-    links:
-      - "spark-master:spark-master.loc"
     ports:
       - "8083:8081"
     networks:
-      - spark-network
+      - loc
     environment:
       MASTER: "spark-master.loc"
       SPARK_WORKER_MEMORY: "4g"
@@ -37,22 +37,21 @@ services:
           memory: "2g"
 
   zeppelin:
+    hostname: zeppelin
     image: localhost:5000/zeppelin:0.4-1
     ports:
       - "8081:8080"
       - "4040:4040"
       - "8022:22"
     networks:
-      - spark-network
-    links:
-      - "spark-master:spark-master.loc"
+      - loc
     environment:
-      MASTER: "spark-master.loc"
+      MASTER: "sppark-master.loc"
     deploy:
       resources:
         limits:
           memory: "2g"
         reservations:
           memory: "2g"
 networks:
-   spark-network:
+   loc: