Improvements for CICD

site type changed from edge to foundry
/opt/akraino/redfish changed to /opt/akraino/tools
sriov label added back, to controle plane and compute nodes

Change-Id: I149301d0d377aba8792fb09de7f2d15ba6423e88
Signed-off-by: Naga Sugguna <ns156u@att.com>

diff --git a/scripts/update_bios_settings.py b/scripts/update_bios_settings.py
index d85d521..cd1736b 100644 (file)
--- a/scripts/update_bios_settings.py
+++ b/scripts/update_bios_settings.py
@@ -56,7 +56,7 @@ def create_rc_masters(source, target_suffix):
     fd2.write("\n")
     fd2.close()
     print '{0} -> {1}'.format(source, target_file)
-    command = '/opt/akraino/redfish/apply_dellxml.sh --rc {0} --template dell_r740_g14_uefi_base.xml.template --no-confirm'.format(target_file)
+    command = '/opt/akraino/tools/apply_dellxml.sh --rc {0} --template dell_r740_g14_uefi_base.xml.template --no-confirm'.format(target_file)
     print 'command: {0}'.format(command)
     os.system(command)
 

diff --git a/site/dellgen10/networks/common-addresses.yaml b/site/dellgen10/networks/common-addresses.yaml
index 398038a..21e5812 100644 (file)
--- a/site/dellgen10/networks/common-addresses.yaml
+++ b/site/dellgen10/networks/common-addresses.yaml
@@ -62,6 +62,11 @@ data:
     - hostname: aknode41
     - hostname: aknode42
 
+  proxy:
+    http: ""
+    https: ""
+    no_proxy: []
+
   node_ports:
     drydock_api: 30000
     maas_api: 30001

diff --git a/site/dellgen10/profiles/host/compute-r01.yaml b/site/dellgen10/profiles/host/compute-r01.yaml
index 2c1bd4d..b8a8fe4 100644 (file)
--- a/site/dellgen10/profiles/host/compute-r01.yaml
+++ b/site/dellgen10/profiles/host/compute-r01.yaml
@@ -119,5 +119,6 @@ data:
       openstack-nova-compute: enabled
       openvswitch: enabled
       openstack-libvirt: kernel
+      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/site/dellgen10/profiles/host/cp-r01.yaml b/site/dellgen10/profiles/host/cp-r01.yaml
index 677e4c7..bd74315 100644 (file)
--- a/site/dellgen10/profiles/host/cp-r01.yaml
+++ b/site/dellgen10/profiles/host/cp-r01.yaml
@@ -169,5 +169,6 @@ data:
       elasticsearch-data: enabled
       postgresql: enabled
       kube-ingress: enabled
+      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/site/dellgen10/site-definition.yaml b/site/dellgen10/site-definition.yaml
index c70996a..0aa12b2 100644 (file)
--- a/site/dellgen10/site-definition.yaml
+++ b/site/dellgen10/site-definition.yaml
@@ -25,5 +25,5 @@ metadata:
   storagePolicy: cleartext
 data:
   revision: v4.0
-  site_type: edge
+  site_type: foundry
 ...

diff --git a/site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml b/site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml
deleted file mode 100644 (file)
index 523484d..0000000
--- a/site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-##############################################################################
-# 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.                   #
-#                                                                            #
-# You may obtain a copy of the License at                                    #
-#       http://www.apache.org/licenses/LICENSE-2.0                           #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-##############################################################################
-
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ipmi_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: calvin
-...

diff --git a/templates/networks/common-addresses.j2 b/templates/networks/common-addresses.j2
index e785ef2..c38ca28 100644 (file)
--- a/templates/networks/common-addresses.j2
+++ b/templates/networks/common-addresses.j2
@@ -63,6 +63,11 @@ data:
     - hostname: {{master.name}}
 {% endfor %}
 
+  proxy:
+    http: ""
+    https: ""
+    no_proxy: []
+
   node_ports:
     drydock_api: 30000
     maas_api: 30001

diff --git a/templates/profiles/host/compute-r01.j2 b/templates/profiles/host/compute-r01.j2
index 52d93a6..be609de 100644 (file)
--- a/templates/profiles/host/compute-r01.j2
+++ b/templates/profiles/host/compute-r01.j2
@@ -108,5 +108,6 @@ data:
       openstack-nova-compute: enabled
       openvswitch: enabled
       openstack-libvirt: kernel
+      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/templates/profiles/host/cp-r01.j2 b/templates/profiles/host/cp-r01.j2
index 9eba946..e59df91 100644 (file)
--- a/templates/profiles/host/cp-r01.j2
+++ b/templates/profiles/host/cp-r01.j2
@@ -158,5 +158,6 @@ data:
       elasticsearch-data: enabled
       postgresql: enabled
       kube-ingress: enabled
+      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/templates/site-definition.j2 b/templates/site-definition.j2
index 5d33c32..bf44d95 100644 (file)
--- a/templates/site-definition.j2
+++ b/templates/site-definition.j2
@@ -25,5 +25,5 @@ metadata:
   storagePolicy: cleartext
 data:
   revision: v4.0
-  site_type: edge
+  site_type: foundry
 ...

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 6b8c28f..0b70cd4 100644 (file)
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -44,7 +44,7 @@ source $(dirname $0)/env_$SITE.sh
 cd $YAML_BUILDS
 # Install OS on Genesis
 python $YAML_BUILDS/scripts/jcopy.py $SITE.yaml $YAML_BUILDS/tools/j2/serverrc.j2 $YAML_BUILDS/tools/"$GENESIS_NAME"rc
-/opt/akraino/redfish/install_server_os.sh --rc /opt/akraino/yaml_builds/tools/"$GENESIS_NAME"rc --skip-confirm
+/opt/akraino/tools/install_server_os.sh --rc /opt/akraino/yaml_builds/tools/"$GENESIS_NAME"rc --skip-confirm
 
 scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/
 ssh $GENESIS_HOST << EOF