- role: cert
instance: "etcd{{ nodeindex }}"
cert_path: /etc/etcd/ssl
+ common_name: "etcd"
alt_names:
ip:
"{{ lookup('template', 'caas-master-nodes.j2') | from_yaml }}"
environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
register: etcd_container_id_add_member
until: etcd_container_id_add_member.stdout
retries: 50
environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
register: etcd_container_id
until: etcd_container_id.stdout
delay: 5
environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
register: result
until: result.stdout|int == master_list|length|int
delay: 5
environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
register: member_add_result
until: (member_add_result.stdout.find("exists") != -1 ) or (member_add_result.stdout.find("added") != -1 )
delay: 10
environment:
DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375"
DOCKER_TLS_VERIFY: "1"
- DOCKER_CERT_PATH: "/etc/docker"
+ DOCKER_CERT_PATH: "{{ caas.cert_directory }}"
register: addresult
- set_fact:
%define COMPONENT etcd
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 3.3.13
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
%define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save