Remove docker network creation and use default docker bridge

pkg/configuration/bdb-deploy.yml

@@ -9,4 +9,4 @@
     - bigchaindb-driver
 
 - import_playbook: multi_node.yml
-  when: (bdb_hosts|length > 1) or docker_cluster_size|int > 1
+  when: (bdb_hosts|length > 1) or docker_cluster_size|int > 1

pkg/configuration/roles/bigchaindb/defaults/main.yml

@@ -47,4 +47,5 @@ bigchaindb_docker_name: "bigchaindb"
 bigchaindb_default_port: 9984
 bigchandb_host_port: 59984
 bigchaindb_host_mount_dir: "{{ ansible_env.HOME }}/bigchaindb_docker"
-bdb_docker_net_name: "bdb_network"
+# Default IP of docker0 bridge
+bigchaindb_default_host: "172.17.0.1"

pkg/configuration/roles/bigchaindb/tasks/deploy_docker.yml

@@ -4,6 +4,7 @@
     path: "{{ bigchaindb_host_mount_dir }}{{ item|string }}/.bigchaindb"
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
   register: stat_result
+  tags: [bigchaindb]
 
 - name: Configuring BigchainDB Docker
   docker_container:
@@ -16,8 +17,6 @@
       BIGCHAINDB_SERVER_BIND: "{{ bigchaindb_server_bind }}"
       BIGCHAINDB_DATABASE_HOST: "{{ hostvars[ansible_hostname]['mongodb' + item|string] }}"
     entrypoint: "bigchaindb -y configure mongodb"
-    networks:
-      - name: "{{ bdb_docker_net_name }}"
   when: stat_result.results[item|int].stat.exists == False
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
   tags: [bigchaindb]
@@ -32,8 +31,6 @@
     restart_policy: always
     volumes:
       - "{{ bigchaindb_host_mount_dir }}{{ item|string }}:/data"
-    networks:
-      - name: "{{ bdb_docker_net_name }}"
     state: started
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
   tags: [bigchaindb]
@@ -48,4 +45,4 @@
   set_fact:
     pub_key_{{ bigchaindb_docker_name }}{{ item }}="{{ (bdb_node_config.results[item|int].stdout|from_json).keypair.public }}"
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
-  tags: [mongodb]
+  tags: [bigchaindb]

pkg/configuration/roles/bigchaindb/tasks/main.yml

@@ -17,4 +17,4 @@
 
 - import_tasks: common.yml
   when: not deploy_docker|bool
-  tags: [bigchaindb]
+  tags: [bigchaindb]

pkg/configuration/roles/key-exchange/defaults/main.yml

@@ -10,4 +10,3 @@ bigchaindb_default_port: 9984
 bigchandb_host_port: 59984
 bigchaindb_host_mount_dir: "{{ ansible_env.HOME }}/bigchaindb_docker"
 bigchaindb_image_name: "bigchaindb/bigchaindb"
-bdb_docker_net_name: "bdb_network"

pkg/configuration/roles/key-exchange/tasks/pub_key_exchange_docker.yml

@@ -25,7 +25,5 @@
       - "{{ bigchaindb_host_mount_dir }}{{ item|string }}:/data"
     state: started
     restart: true
-    networks:
-      - name: "{{ bdb_docker_net_name }}"
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
-  tags: [bigchaindb]
+  tags: [keyex]

pkg/configuration/roles/mongodb/defaults/main.yml

@@ -32,12 +32,8 @@ mongodb_admin_password: "superstrongpassword"
 
 replica_set_name: bigchain-rs
 
-bdb_docker_net_name: "bdb_network"
-bdb_docker_default_subnet: "172.18.0.0/16"
-bdb_docker_default_gw: "172.18.0.1"
-
 # Docker configuration
 mongodb_docker_image: "mongo:3.4.9"
 mongodb_docker_name: "mongodb"
 mongodb_host_mount_dir: "{{ ansible_env.HOME }}/mongodb_docker"
-mongodb_host_config: "{{ ansible_env.HOME }}/config"
+mongodb_host_config: "{{ ansible_env.HOME }}/config"

pkg/configuration/roles/mongodb/tasks/deploy_docker.yml

@@ -6,19 +6,6 @@
     state: started
   tags: [mongodb]
 
-- name: Creating BDB Docker network
-  docker_network:
-    name: "{{ bdb_docker_net_name }}"
-    ipam_options:
-      subnet: "{{ bdb_docker_default_subnet }}"
-    driver_options:
-      com.docker.network.bridge.enable_icc": "true"
-      com.docker.network.bridge.enable_ip_masquerade": "true"
-      com.docker.network.bridge.host_binding_ipv4": "0.0.0.0"
-      com.docker.network.driver.mtu: "1500"
-    state: present
-  tags: [mongodb]
-
 - name: Running MongoDB Docker
   docker_container:
     name: "{{ mongodb_docker_name }}{{ item }}"
@@ -26,7 +13,7 @@
     image: "{{ mongodb_docker_image }}"
     detach: true
     published_ports:
-      - "{{ bdb_docker_default_gw }}:{{ (mongodb_port|int + item|int)|string }}:{{ mongodb_port }}"
+      - "{{ (mongodb_port|int + item|int)|string }}:{{ mongodb_port }}"
     restart_policy: always
     volumes:
       - "{{ mongodb_host_mount_dir }}{{ item|string }}/db:{{ mongodb_storage_path }}"
@@ -35,8 +22,6 @@
     state: started
     keep_volumes: true
     entrypoint: /entrypoint.sh --replSet=bigchain-rs
-    networks:
-      - name: "{{ bdb_docker_net_name }}"
   register: mongo_container_info
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
   tags: [mongodb]
@@ -45,4 +30,4 @@
   set_fact:
     mongodb{{ item }}={{ mongo_container_info.results[item|int].ansible_facts.docker_container.NetworkSettings.IPAddress }}
   with_sequence: start=0 end="{{ docker_cluster_size|int - 1 }}" stride=1
-  tags: [mongodb]
+  tags: [mongodb]

pkg/configuration/roles/mongodb/tasks/initiate_repl_set.yml

@@ -3,4 +3,4 @@
   when: (ansible_hostname == bdb_hosts[bdb_hosts|length-1]['name']) and not deploy_docker|bool
 
 - import_tasks: initiate_repl_set_docker.yml
-  when: deploy_docker|bool
+  when: deploy_docker|bool and docker_cluster_size|int > 1

pkg/configuration/roles/mongodb/tasks/main.yml

@@ -28,4 +28,4 @@
   when: not deploy_docker|bool
   tags: [mongodb]
 
-- import_tasks: initiate_repl_set.yml
+- import_tasks: initiate_repl_set.yml

pkg/configuration/roles/mongodb/templates/replSet_init_docker.j2

@@ -3,14 +3,14 @@ rs.initiate({
   "members": [
     {
       "_id": 0,
-      "host": "{{ mongodb_docker_name }}{{ docker_cluster_size|int - 1 }}:{{ mongodb_port }}"
+      "host": "{{ hostvars[ansible_hostname][mongodb_docker_name + (docker_cluster_size|int - 1)|string] }}:{{ mongodb_port }}"
     }
   ]
 });
 sleep(5000);
 {% for docker in range(0, docker_cluster_size|int, 1) %}
 {%- if docker != (docker_cluster_size|int - 1) -%}
-rs.add("{{ mongodb_docker_name }}{{ docker }}:{{ mongodb_port }}");
+rs.add("{{ hostvars[ansible_hostname][mongodb_docker_name + docker|string] }}:{{ mongodb_port }}");
 {% endif %}
 {%- endfor -%}
 use admin;
@@ -27,4 +27,4 @@ db.createUser(db.createUser({
       "db": "admin"
     }
   ]
-});
+});