%define COMPONENT instantiate
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 9
+%define RPM_MINOR_VERSION 10
Name: %{RPM_NAME}
Version: %{RPM_MAJOR_VERSION}
- role: cert
instance: "docker{{ nodeindex }}"
- cert_path: /etc/docker
- become: true
- become_user: "root"
-
- - role: cert
+ cert_path: "{{ caas.cert_directory }}"
cert_name: "cert.pem"
key_name: "key.pem"
- instance: "docker"
- cert_path: /etc/docker
+ common_name: "docker"
alt_names:
ip:
- "{{ ansible_host }}"
become_user: "root"
- role: cert
- instance: "client{{ nodeindex }}"
- cert_path: /etc/docker
+ instance: "docker-client{{ nodeindex }}"
+ cert_path: "{{ caas.cert_path }}"
+ common_name: "docker-client"
add_users:
- kube
become: true
with_items:
- "DOCKER_HOST=tcp://{{ networking.infra_internal.ip }}:2375"
- "DOCKER_TLS_VERIFY=1"
- - "DOCKER_CERT_PATH=/etc/docker"
+ - "DOCKER_CERT_PATH={{ caas.cert_directory }}"
with_items:
- "export DOCKER_HOST=tcp://{{ networking.infra_internal.ip }}:2375"
- "export DOCKER_TLS_VERIFY='1'"
- - "export DOCKER_CERT_PATH=/etc/docker"
+ - "export DOCKER_CERT_PATH={{ caas.cert_directory }}"
become_user: "root"
RestartSec=1s
Environment=DOCKER_HOST=tcp://{{ hostname|lower }}:2375
Environment=DOCKER_TLS_VERIFY=1
-Environment=DOCKER_CERT_PATH=/etc/docker
+Environment=DOCKER_CERT_PATH={{ caas.cert_directory }}
[Install]
WantedBy=multi-user.target
docker_environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
image_file_extension: .tar
image_directory: "{{ caas.infra_containers_directory }}"
docker_environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
registry: "{{ caas.registry_url }}:{{ caas.registry_port }}"
registry_repo: "{{ caas.registry_repo }}"