Merge "Use default tenant network on infra components"

diff --git a/SPECS/registry.spec b/SPECS/registry.spec
index e7cb5dd..ef216ec 100644 (file)
--- a/SPECS/registry.spec
+++ b/SPECS/registry.spec
@@ -96,4 +96,3 @@ fi
 
 %clean
 rm -rf ${buildroot}
-

diff --git a/ansible/roles/registry/templates/main/docker-registry.yml b/ansible/roles/registry/templates/main/docker-registry.yml
index 3bb725a..d140676 100644 (file)
--- a/ansible/roles/registry/templates/main/docker-registry.yml
+++ b/ansible/roles/registry/templates/main/docker-registry.yml
@@ -25,13 +25,6 @@ spec:
       name: registry
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         name: registry
     spec:

diff --git a/ansible/roles/registry/templates/update/docker-registry-update.yml b/ansible/roles/registry/templates/update/docker-registry-update.yml
index 89b2387..36407f7 100644 (file)
--- a/ansible/roles/registry/templates/update/docker-registry-update.yml
+++ b/ansible/roles/registry/templates/update/docker-registry-update.yml
@@ -25,13 +25,6 @@ spec:
       name: registry-update
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         name: registry-update
     spec: