X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fbaremetal%2Fcalico-ip-rules.j2;fp=templates%2Faic-clcp-manifests%2Fbaremetal%2Fbootaction.j2;h=328a1b6492ae6b22bfb64b9907b427fe6f2e7e2d;hb=refs%2Fchanges%2F69%2F369%2F1;hp=6b633445d01717e036363531005b794efa3e8fbe;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/baremetal/bootaction.j2 b/templates/baremetal/calico-ip-rules.j2
similarity index 71%
rename from templates/aic-clcp-manifests/baremetal/bootaction.j2
rename to templates/baremetal/calico-ip-rules.j2
index 6b63344..328a1b6 100644
--- a/templates/aic-clcp-manifests/baremetal/bootaction.j2
+++ b/templates/baremetal/calico-ip-rules.j2
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -15,50 +15,6 @@
 # limitations under the License.                                             #
 ##############################################################################
 
-schema: 'drydock/BootAction/v1'
-metadata:
-  schema: 'metadata/Document/v1'
-  name: promjoin
-  storagePolicy: 'cleartext'
-  layeringDefinition:
-    abstract: false
-    layer: site
-  labels:
-    application: 'drydock'
-data:
-  node_filter:
-    filter_set_type: 'union'
-    filter_set:
-      - filter_type: 'union'
-        node_names:
-{% for server in yaml.servers %}
-          - '{{server.name}}'
-{% endfor %}
-{% raw %}  # TODO(alanmeadows) move what is global about this document - everything except nodenames to global
-  assets:
-    - path: /opt/promjoin.sh
-      type: file
-      permissions: '555'
-      # TODO(alanmeadows) You must replace the ip= parameter below with the appropriate MaaS network name of the network
-      # you should use to contact kubernetes in the case below, this is cab24_mgmt
-      location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}{% if 'ksn' in node.network %}&ip={{ node.network.ksn.ip }}{% endif %}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %}
-      location_pipeline:
-        - template
-      data_pipeline:
-        - utf8_decode
-    - path: /lib/systemd/system/promjoin.service
-      type: unit
-      permissions: '600'
-      data: |-
-        W1VuaXRdCkRlc2NyaXB0aW9uPVByb21lbmFkZSBJbml0aWFsaXphdGlvbiBTZXJ2aWNlCkFmdGVy
-        PW5ldHdvcmstb25saW5lLnRhcmdldCBsb2NhbC1mcy50YXJnZXQKQ29uZGl0aW9uUGF0aEV4aXN0
-        cz0hL3Zhci9saWIvcHJvbS5kb25lCgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS9v
-        cHQvcHJvbWpvaW4uc2gKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldAo=
-      data_pipeline:
-        - base64_decode
-        - utf8_decode
-{% endraw %}
----
 schema: 'drydock/BootAction/v1'
 metadata:
   schema: 'metadata/Document/v1'
@@ -201,24 +157,4 @@ data:
                 lookup "${TABLE}" \
                 pref 10100
         fi
----
-schema: 'drydock/BootAction/v1'
-metadata:
-  schema: 'metadata/Document/v1'
-  name: i40evf_blacklist
-  storagePolicy: 'cleartext'
-  layeringDefinition:
-    abstract: false
-    layer: site
-  labels:
-    application: 'drydock'
-data:
-  assets:
-    - path: /etc/modprobe.d/sriov_blacklist.conf
-      type: file
-      permissions: '644'
-      data_pipeline:
-        - utf8_decode
-      data: |
-        blacklist i40evf
 ...