Commit dd93378a authored by nanahira's avatar nanahira

add noDockerOp

parent dd19d7eb
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
remove_orphans: true remove_orphans: true
# pull: true # pull: true
when: not noBird when: not noBird and not noDockerOp
#- name: systemd bird #- name: systemd bird
# become: true # become: true
# template: # template:
...@@ -197,40 +197,40 @@ ...@@ -197,40 +197,40 @@
restarted: true restarted: true
services: services:
- gateways-monitor - gateways-monitor
when: not noBird when: not noBird and not noDockerOp
- name: restart_frps - name: restart_frps
docker_compose: docker_compose:
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
restarted: true restarted: true
services: services:
- frps - frps
when: not noBird when: not noBird and not noDockerOp
- name: restart_frpc - name: restart_frpc
docker_compose: docker_compose:
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
restarted: true restarted: true
services: '{{frpcRestarts}}' services: '{{frpcRestarts}}'
when: frpcRestarts when: frpcRestarts and not noDockerOp
- name: restart_ocserv - name: restart_ocserv
docker_compose: docker_compose:
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
restarted: true restarted: true
services: services:
- ocserv - ocserv
when: not noBird when: not noBird and not noDockerOp
- name: restart_gost - name: restart_gost
docker_compose: docker_compose:
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
restarted: true restarted: true
services: services:
- gost - gost
when: installGost when: installGost and not noDockerOp
- name: restart_openconnect - name: restart_openconnect
docker_compose: docker_compose:
project_src: '{{ansible_user_dir}}/nextgen-network/services' project_src: '{{ansible_user_dir}}/nextgen-network/services'
restarted: true restarted: true
services: '{{ocRestarts}}' services: '{{ocRestarts}}'
when: ocRestarts when: ocRestarts and not noDockerOp
#- name: restart_bird_systemd #- name: restart_bird_systemd
# become: true # become: true
# systemd: # systemd:
......
...@@ -281,7 +281,8 @@ class InventoryBuilder { ...@@ -281,7 +281,8 @@ class InventoryBuilder {
ansible_ssh_port: host.sshPort || 22, ansible_ssh_port: host.sshPort || 22,
ansible_python_interpreter: host.python || 'python3', ansible_python_interpreter: host.python || 'python3',
noBird: !!host.noBird, noBird: !!host.noBird,
systemBird: !!host.sysBird systemBird: !!host.sysBird,
noDockerOp: !!host.noDockerOp,
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment