Merge "Use default tenant network on infra components"

diff --git a/SPECS/swift.spec b/SPECS/swift.spec
index 3f0edcf..b698233 100644 (file)
--- a/SPECS/swift.spec
+++ b/SPECS/swift.spec
@@ -15,7 +15,7 @@
 %define COMPONENT swift
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.21.0
-%define RPM_MINOR_VERSION 5
+%define RPM_MINOR_VERSION 6
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}

diff --git a/ansible/roles/registry_pre_config/meta/main.yml b/ansible/roles/registry_pre_config/meta/main.yml
index 16b03ea..97313f3 100644 (file)
--- a/ansible/roles/registry_pre_config/meta/main.yml
+++ b/ansible/roles/registry_pre_config/meta/main.yml
@@ -32,6 +32,7 @@ dependencies:
   - role: cert
     instance: "registry{{ nodeindex }}"
     cert_path: /etc/docker-registry
+    common_name: "docker-registry"
     alt_names:
       dns:
         - "{{ caas.registry_url }}"
@@ -41,6 +42,7 @@ dependencies:
   - role: cert
     instance: "update-registry"
     cert_path: /etc/docker-update-registry
+    common_name: "update-registry"
     alt_names:
       dns:
         - "{{ caas.update_registry_url }}"

diff --git a/ansible/roles/swift/meta/main.yml b/ansible/roles/swift/meta/main.yml
index b8995b1..a0fc348 100644 (file)
--- a/ansible/roles/swift/meta/main.yml
+++ b/ansible/roles/swift/meta/main.yml
@@ -33,6 +33,7 @@ dependencies:
   - role: cert
     instance: "swift{{ nodeindex }}"
     cert_path: /etc/swift/main/tls-proxy
+    common_name: "swift-main"
     alt_names:
       dns:
         - "{{ caas.swift_url }}"
@@ -44,6 +45,7 @@ dependencies:
   - role: cert
     instance: "swift-update{{ nodeindex }}"
     cert_path: /etc/swift/update/tls-proxy
+    common_name: "swift-update"
     alt_names:
       dns:
         - "{{ caas.swift_update_url }}"