diff --git a/ansible/roles/jenkins/tasks/main.yml b/ansible/roles/jenkins/tasks/main.yml index 98655f1..d254da5 100644 --- 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 deleted file mode 100644 index 9c1336c..0000000 --- a/ansible/roles/jenkins/tasks/show-jenkins-pw.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: get jenkins password - become: yes - shell: > - docker exec $(docker ps -f name=jenkins | awk '/jenkins/ { print $1 }')\ - cat /var/jenkins_home/secrets/initialAdminPassword - register: jenkins_initial_admin_password - when: inventory_hostname == master_hostname - -- name: Initial Jenkins Admin Password - debug: msg="{{jenkins_initial_admin_password.stdout}}" - when: inventory_hostname == master_hostname diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 0ecddc5..39a8d18 100644 --- 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,17 +37,16 @@ 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: @@ -55,4 +54,4 @@ services: reservations: memory: "2g" networks: - spark-network: + loc: