From 2fca21164f3ad88f1ab2d31183966102cb3805a0 Mon Sep 17 00:00:00 2001
From: Eddie Arrage <eddie.arrage@huawei.com>
Date: Fri, 27 Apr 2018 20:56:52 +0000
Subject: Update yaml manifests for Fraser release tag

- Updated the SDC toplevel manifest to use the 'opnfv-6.0.0' tag
- Updated the yaml rendering scripts for individual services
under snort/nginx to use opnfv docker images

Change-Id: I90ef2a8ff5fcc47076192cb556a3a0ff3a9bd846
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
---
 docs/index.rst                                         |  6 +++---
 .../scenarios/service_delivery_controller_opnfv.yaml   | 18 +++++++++---------
 samples/services/nginx/yaml/render_yaml.py             |  4 ++--
 samples/services/snort_ids/yaml/render_yaml.py         |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 0d81d0d..bb9a25d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,9 +3,9 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Authors of Clover
 
-========================
-OPNFV Clover Design Docs
-========================
+======================================
+OPNFV Clover Tool Install & Validation
+======================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/samples/scenarios/service_delivery_controller_opnfv.yaml b/samples/scenarios/service_delivery_controller_opnfv.yaml
index ee0adcc..ee01862 100644
--- a/samples/scenarios/service_delivery_controller_opnfv.yaml
+++ b/samples/scenarios/service_delivery_controller_opnfv.yaml
@@ -57,7 +57,7 @@ spec:
     spec:
       containers:
         - name: clover-server1
-          image: opnfv/clover-ns-nginx-server:latest
+          image: opnfv/clover-ns-nginx-server:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -91,7 +91,7 @@ spec:
     spec:
       containers:
         - name: clover-server2
-          image: opnfv/clover-ns-nginx-server:latest
+          image: opnfv/clover-ns-nginx-server:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -125,7 +125,7 @@ spec:
     spec:
       containers:
         - name: clover-server3
-          image: opnfv/clover-ns-nginx-server:latest
+          image: opnfv/clover-ns-nginx-server:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -159,7 +159,7 @@ spec:
     spec:
       containers:
         - name: clover-server4
-          image: opnfv/clover-ns-nginx-server:latest
+          image: opnfv/clover-ns-nginx-server:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -193,7 +193,7 @@ spec:
     spec:
       containers:
         - name: clover-server5
-          image: opnfv/clover-ns-nginx-server:latest
+          image: opnfv/clover-ns-nginx-server:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -229,7 +229,7 @@ spec:
     spec:
       containers:
         - name: http-lb
-          image: opnfv/clover-ns-nginx-lb:latest
+          image: opnfv/clover-ns-nginx-lb:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -250,7 +250,7 @@ spec:
     spec:
       containers:
         - name: http-lb
-          image: opnfv/clover-ns-nginx-lb:latest
+          image: opnfv/clover-ns-nginx-lb:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
@@ -284,7 +284,7 @@ spec:
     spec:
       containers:
         - name: snort-ids
-          image: opnfv/clover-ns-snort-ids:latest
+          image: opnfv/clover-ns-snort-ids:opnfv-6.0.0
           ports:
            - containerPort: 50052
            - containerPort: 50054
@@ -324,7 +324,7 @@ spec:
     spec:
       containers:
         - name: proxy-access-control
-          image: opnfv/clover-ns-nginx-proxy:latest
+          image: opnfv/clover-ns-nginx-proxy:opnfv-6.0.0
           ports:
            - containerPort: 50054
            - containerPort: 9180
diff --git a/samples/services/nginx/yaml/render_yaml.py b/samples/services/nginx/yaml/render_yaml.py
index 850f715..13be652 100644
--- a/samples/services/nginx/yaml/render_yaml.py
+++ b/samples/services/nginx/yaml/render_yaml.py
@@ -58,10 +58,10 @@ if __name__ == '__main__':
             '--image_name', required=True,
             help='The image name to use')
     parser.add_argument(
-            '--image_path', default='localhost:5000',
+            '--image_path', default='opnfv',
             help='The path to the images to use')
     parser.add_argument(
-            '--image_tag', default='latest',
+            '--image_tag', default='opnfv-6.0.0',
             help='The image tag to use')
     parser.add_argument(
             '--deploy_name', default='default',
diff --git a/samples/services/snort_ids/yaml/render_yaml.py b/samples/services/snort_ids/yaml/render_yaml.py
index 42a2615..c4dcec5 100644
--- a/samples/services/snort_ids/yaml/render_yaml.py
+++ b/samples/services/snort_ids/yaml/render_yaml.py
@@ -42,10 +42,10 @@ if __name__ == '__main__':
             '--image_name', default='clover-ns-snort-ids',
             help='The image name to use')
     parser.add_argument(
-            '--image_path', default='localhost:5000',
+            '--image_path', default='opnfv',
             help='The path to the image to use')
     parser.add_argument(
-            '--image_tag', default='latest',
+            '--image_tag', default='opnfv-6.0.0',
             help='The image tag to use')
     parser.add_argument(
             '--deploy_name', default='snort-ids',
-- 
cgit 1.2.3-korg