Redfish Integration

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

diff --git a/site/common/secrets/passphrases/ipmi_admin_password.yaml b/site/common/secrets/passphrases/ipmi_admin_password.yaml
deleted file mode 100644 (file)
index 523484d..0000000
--- a/site/common/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/site/dellgen10/profiles/genesis.yaml b/site/dellgen10/profiles/genesis.yaml
index 8f8c4d5..62b4d5a 100644 (file)
--- a/site/dellgen10/profiles/genesis.yaml
+++ b/site/dellgen10/profiles/genesis.yaml
@@ -50,8 +50,8 @@ data:
       - ucp-control-plane=enabled
       - maas-control-plane=enabled
       - ceph-osd-bootstrap=enabled
-#      - openstack-libvirt=kernel
-#      - openvswitch=enabled
-#      - openstack-control-plane=enabled
-#      - openstack-nova-compute=enabled
+      - openstack-libvirt=kernel
+      - openvswitch=enabled
+      - openstack-control-plane=enabled
+      - openstack-nova-compute=enabled
 ...

diff --git a/site/dellgen10/profiles/host/compute-r01.yaml b/site/dellgen10/profiles/host/compute-r01.yaml
index b8a8fe4..2c1bd4d 100644 (file)
--- a/site/dellgen10/profiles/host/compute-r01.yaml
+++ b/site/dellgen10/profiles/host/compute-r01.yaml
@@ -119,6 +119,5 @@ 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 8b858bc..677e4c7 100644 (file)
--- a/site/dellgen10/profiles/host/cp-r01.yaml
+++ b/site/dellgen10/profiles/host/cp-r01.yaml
@@ -135,7 +135,6 @@ data:
       openstack-libvirt: kernel
       openvswitch: enabled
       openstack-nova-compute: enabled
-      sriov: enabled
       ucp-barbican: enabled
       ceph-bootstrap: enabled
       ceph-mon: enabled
@@ -170,6 +169,5 @@ data:
       elasticsearch-data: enabled
       postgresql: enabled
       kube-ingress: enabled
-      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/templates/profiles/host/compute-r01.j2 b/templates/profiles/host/compute-r01.j2
index be609de..52d93a6 100644 (file)
--- a/templates/profiles/host/compute-r01.j2
+++ b/templates/profiles/host/compute-r01.j2
@@ -108,6 +108,5 @@ 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 116a532..9eba946 100644 (file)
--- a/templates/profiles/host/cp-r01.j2
+++ b/templates/profiles/host/cp-r01.j2
@@ -124,7 +124,6 @@ data:
       openstack-libvirt: kernel
       openvswitch: enabled
       openstack-nova-compute: enabled
-      sriov: enabled
       ucp-barbican: enabled
       ceph-bootstrap: enabled
       ceph-mon: enabled
@@ -159,6 +158,5 @@ data:
       elasticsearch-data: enabled
       postgresql: enabled
       kube-ingress: enabled
-      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index d7e84aa..6aef8ba 100755 (executable)
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -19,6 +19,10 @@
 # re-generate prom config
 
 set -x
+TIMESTAMP=$(date +"%Y%m%d%H%M")
+echo "logging to /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log"
+exec > /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log
+exec 2>&1
 
 source $(dirname $0)/setenv.sh
 

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 79aa546..6b8c28f 100644 (file)
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -15,6 +15,11 @@
 # limitations under the License.                                             #
 ##############################################################################
 
+set -x
+TIMESTAMP=$(date +"%Y%m%d%H%M")
+echo "Logging to /var/log/yaml_builds/2genesis_$TIMESTAMP.log"
+exec > /var/log/yaml_builds/2genesis_$TIMESTAMP.log
+exec 2>&1
 
 source $(dirname $0)/setenv.sh
 
@@ -37,16 +42,18 @@ fi
 source $(dirname $0)/env_$SITE.sh
 
 cd $YAML_BUILDS
-# Update BIOS Setting
-python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
 # 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
 
 scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/
 ssh $GENESIS_HOST << EOF
+  # TODO avoid following hard coding$
+  route add -net 192.168.41.0/24 gw 192.168.2.1 bond0.41
   mkdir -p /root/akraino
   cp /tmp/promenade-bundle-$SITE.tar /root/akraino/
   cd /root/akraino/
   tar -xmf promenade-bundle-$SITE.tar
 EOF
+# Update BIOS Setting
+python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml

diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index 465d549..dd5c91d 100644 (file)
--- a/tools/j2/serverrc.j2
+++ b/tools/j2/serverrc.j2
@@ -52,7 +52,7 @@ SRV_BLD_SCRIPT=script-hwe-16.04.5-amd64.ipxe
 # template xml file to set bios and raid configuration settings
 SRV_BIOS_TEMPLATE=dell_r740_g14_uefi_base.xml.template
 SRV_BOOT_TEMPLATE=dell_r740_g14_uefi_httpboot.xml.template
-SRV_HTTP_BOOT_DEV=NIC.Slot.7-1-1
+SRV_HTTP_BOOT_DEV=NIC.Slot.2-1-1
 
 # tempalte to run to configure OS after first boot
 # current options are: firstboot.sh.template, firstboot-genesis.sh.tempate or firstboot-airship-iab.sh.template
@@ -63,6 +63,7 @@ SRV_VLAN={{yaml.networks.host.vlan}}
 SRV_STORAGE_VLAN={{yaml.networks.storage.vlan}}
 SRV_CALICO_VLAN={{yaml.networks.ksn.vlan}}
 SRV_NEUTRON_VLAN={{yaml.networks.neutron.vlan}}
+SRV_PXE_INF={{yaml.networks.pxe.interface}}
 
 # basic network information for dhcp config and final server network settings
 SRV_MTU=9000
@@ -70,6 +71,7 @@ SRV_IP={{yaml.genesis.host}}
 SRV_STORAGE_IP={{yaml.genesis.storage}}
 SRV_CALICO_IP={{yaml.genesis.ksn}}
 SRV_NEUTRON_IP={{yaml.genesis.neutron}}
+SRV_PXE_IP={{yaml.genesis.pxe}}
 SRV_SUBNET={{yaml.networks.host.subnet}}
 SRV_NETMASK={{yaml.networks.host.netmask}}
 SRV_GATEWAY={{yaml.networks.host.routes.gateway}}
@@ -85,5 +87,5 @@ SRV_PWD={{yaml.genesis.root_password}}
 # network bond information
 SRV_BOND={{yaml.networks.primary}}
 {% for slave in yaml.networks.slaves %}
-SRV_SLAVE{{loop.index}}={{slave.name}}  
+SRV_SLAVE{{loop.index}}={{slave.name}}
 {% endfor %}