From: Levente Kálé <levente.kale@nokia.com>
Date: Wed, 31 Jul 2019 18:10:50 +0000 (+0000)
Subject: Merge "Use default tenant network on infra components"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=commitdiff_plain;h=8fa3988c79773820700d1ac9e1701f324115d4ca;hp=217acb66cdacb9500370a66ea4371dd546ae6275

Merge "Use default tenant network on infra components"
---

diff --git a/SPECS/registry.spec b/SPECS/registry.spec
index e7cb5dd..ef216ec 100644
--- 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
--- 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
--- 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: