Merge "Use same networks as docs in pod11"

diff --git a/INFO.yaml b/INFO.yaml
index c0c53ba..1c93838 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,102 +1,119 @@
 ---
-project: 'icn'
-project_creation_date: '2019-12-16'
+project: 'Integrated Cloud Native NFV/App stack family'
+project_creation_date: '6/24/2019'
 project_category: ''
-lifecycle_state: 'Incubation'
+lifecycle_state: ''
 project_lead: &akraino_icn_ptl
-    name: 'Kuralamudhan Ramakrishnan'
+    name: 'Kuralamdhan Ramakrishnan'
     email: 'kuralamudhan.ramakrishnan@intel.com'
     id: 'r.kuralamudhan'
-    company: 'intel'
-    timezone: 'Unknown/Unknown'
+    company: 'Intel'
+    timezone: 'America/Oregon'
 primary_contact: *akraino_icn_ptl
 issue_tracking:
     type: 'jira'
-    url: 'https://jira.akraino.org/projects/'
-    key: 'icn'
+    url: 'https://jira.akraino.org/projects/ICN'
+    key: 'ICN'
 mailing_list:
-    type: 'groups.io'
-    url: 'technical-discuss@lists.akraino.org'
-    tag: '[]'
+    type: 'mail2'
+    url: ''
+    tag: '[releng]'
 realtime_discussion:
-    type: 'irc'
-    server: 'freenode.net'
-    channel: '#akraino'
+    type: ''
+    server: ''
+    channel: '#lf-releng'
 meetings:
-    - type: 'gotomeeting+irc'
-      agenda: 'https://wiki.akraino.org/display/'
+    - type: ''
+      agenda: 'https://wiki.akraino.org/pages/viewpage.action?pageId=4456453'
       url: ''
-      server: 'freenode.net'
-      channel: '#akraino'
+      server: ''
+      channel: ''
       repeats: ''
       time: ''
 repositories:
-    - icn
+    - 'icn'
 committers:
-    - name: 'Kuralamudhan Ramakrishnan'
-      email: 'kuralamudhan.ramakrishnan@intel.com'
-      company: 'intel'
-      id: 'r.kuralamudhan'
-      timezone: 'Unknown/Unknown'
-    - name: 'Houa Yang'
-      email: 'hyang@contractor.linuxfoundation.org'
-      company: 'contractor.linuxfoundation'
-      id: 'hyang'
-      timezone: 'Unknown/Unknown'
-    - name: 'Akhila Kishore'
-      email: 'akhila.kishore@intel.com'
-      company: 'intel'
-      id: 'akhilakishore'
-      timezone: 'Unknown/Unknown'
-    - name: 'Aric Gardner'
-      email: 'agardner@linuxfoundation.org'
-      company: 'linuxfoundation'
-      id: 'agardner'
-      timezone: 'Unknown/Unknown'
-    - name: 'Huifeng Le'
-      email: 'huifeng.le@intel.com'
-      company: 'intel'
-      id: 'hle2'
-      timezone: 'Unknown/Unknown'
-    - name: 'Sriram Rupanagunta'
-      email: 'srupanagunta@aarnanetworks.com'
-      company: 'aarnanetworks'
-      id: 'SriramRupanagunta'
-      timezone: 'Unknown/Unknown'
-    - name: 'Itohan Ukponmwan'
-      email: 'itohan.ukponmwan@intel.com'
-      company: 'intel'
-      id: 'Itohan'
-      timezone: 'Unknown/Unknown'
+    - <<: *akraino_icn_ptl
+    - name: 'John Hinman'
+      email: 'john.hinman@intel.com'
+      company: 'Intel'
+      id: 'jhinman1'
+      timezone: 'America/Oregon'
     - name: 'Enyinna Ochulor'
       email: 'enyinna.ochulor@intel.com'
-      company: 'intel'
+      company: 'Intel'
       id: 'enyinna1234'
-      timezone: 'Unknown/Unknown'
+      timezone: 'America/Oregon'
+    - name: 'Itohan Ukponmwan'
+      email: 'itohan.ukponmwan@intel.com'
+      company: 'Intel'
+      id: 'Itohan'
+      timezone: 'America/Oregon'
+    - name: 'Huifeng Lei'
+      email: 'huifeng.le@intel.com'
+      company: 'Intel'
+      id: 'hle2'
+      timezone: 'Asia/Shanghai'
     - name: 'Cheng Li'
       email: 'cheng1.li@intel.com'
-      company: 'intel'
+      company: 'Intel'
       id: 'chengli3'
-      timezone: 'Unknown/Unknown'
-    - name: 'ramamani yeleswarapu'
-      email: 'ramamani.yeleswarapu@intel.com'
-      company: 'intel'
-      id: 'ramay'
-      timezone: 'Unknown/Unknown'
+      timezone: 'Asia/Shanghai'
+    - name: 'Ramki Krishnan'
+      email: 'ramkik@vmware.com'
+      company: 'VMware'
+      id: ''
+      timezone: ''
+    - name: 'Constantine Polychronopoluous'
+      email: 'cpolychronop@vmware.com'
+      company: 'VMware'
+      id: ''
+      timezone: ''
+    - name: 'Amar Kapadia'
+      email: 'akapadia@aarnanetworks.com'
+      company: 'Aarna Networks'
+      id: ''
+      timezone: ''
+    - name: 'Sriram Rupanagunta'
+      email: 'srupanagunta@aarnanetworks.com'
+      company: 'Aarna Networks'
+      id: ''
+      timezone: ''
+    - name: 'Prem Sankar G'
+      email: 'premsankar@gmail.com'
+      company: 'Lumina Networks'
+      id: ''
+      timezone: ''
+    - name: 'Ravi Chunduru'
+      email: 'ravi.chunduru@verizon.com'
+      company: 'Verizon'
+      id: ''
+      timezone: ''
     - name: 'Tingjie Chen'
       email: 'tingjie.chen@intel.com'
-      company: 'intel'
-      id: 'tingjiec'
-      timezone: 'Unknown/Unknown'
-    - name: 'Dileep Ranganathan'
-      email: 'dileep.ranganathan@intel.com'
-      company: 'intel'
-      id: 'dileep.ranganathan'
-      timezone: 'Unknown/Unknown'
-tsc:
-    # yamllint disable rule:line-length
-    approval: 'missing'
-    changes:
-        - type: ''
-          name: ''
-          link: ''
+      company: 'Intel'
+      id: ''
+      timezone: 'Asia/Shanghai'
+    - name: 'Akhila Kishore'
+      email: 'akhila.kishore@intel.com'
+      company: 'Intel'
+      id: 'akhilakishore'
+      timezone: 'America/Oregon'
+   - name: 'Ritu Sood'
+      email: 'ritu.sood@intel.com'
+      company: 'Intel'
+      id: 'ritusood'
+      timezone: 'America/Oregon'
+   - name: 'Ramamani Yeleswarapu'
+      email: 'ramamani.yeleswarapu@intel.com'
+      company: 'Intel'
+      id: 'ramay'
+      timezone: 'America/Oregon'
+   - name: 'Haibin Huang'
+      email: 'haibin.huang@intel.com'
+      company: 'Intel'
+      id: 'ramay'
+      timezone: 'America/Oregon'
+   - name: 'Palaniappan Ramanathan'
+      email: 'palaniappan.ramanathan@intel.com'
+      company: 'Intel'

diff --git a/README.md b/README.md
index 9ca60b4..6034c97 100644 (file)
--- a/README.md
+++ b/README.md
@@ -138,9 +138,6 @@ The user will find the network configuration file named as
 
 #Ironic Metal3 settings for provisioning network (Net B)
 export IRONIC_INTERFACE="eno2"
-
-#Ironic Metal3 setting for IPMI LAN Network (Net C)
-export IRONIC_IPMI_INTERFACE="eno1"
 ```
 
 #### Running

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 7a91208..07eb7f1 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -6,7 +6,6 @@ NODES_FILE=${NODES_FILE:-"${IRONIC_DATA_DIR}/nodes.json"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
-IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
 BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
 BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index 9855522..c20ff11 100755 (executable)
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -48,11 +48,6 @@ function configure_ironic_interfaces {
         fi
     done
 
-    # Allow ipmi to the bmc processes
-    if ! sudo iptables -C INPUT -i $IRONIC_IPMI_INTERFACE -p udp -m udp --dport 6230:6235 -j ACCEPT 2>/dev/null ; then
-        sudo iptables -I INPUT -i $IRONIC_IPMI_INTERFACE -p udp -m udp --dport 6230:6235 -j ACCEPT
-    fi
-
     #Allow access to dhcp and tftp server for pxeboot
     for port in 67 69 ; do
         if ! sudo iptables -C INPUT -i $IRONIC_PROVISIONING_INTERFACE -p udp --dport $port -j ACCEPT 2>/dev/null ; then

diff --git a/tools/vagrant/create_user_config.sh b/tools/vagrant/create_user_config.sh
index bda1491..33850c8 100755 (executable)
--- a/tools/vagrant/create_user_config.sh
+++ b/tools/vagrant/create_user_config.sh
@@ -6,7 +6,4 @@ cat <<EOF >user_config.sh
 
 #Ironic Metal3 settings for provisioning network
 export IRONIC_INTERFACE="eth1"
-
-#Ironic Metal3 setting for IPMI LAN Network
-export IRONIC_IPMI_INTERFACE="eth0"
 EOF

diff --git a/user_config.sh b/user_config.sh
index 8ff2255..c172caf 100644 (file)
--- a/user_config.sh
+++ b/user_config.sh
@@ -2,6 +2,3 @@
 
 #Ironic Metal3 settings for provisioning network
 export IRONIC_INTERFACE="enp4s0f3"
-
-#Ironic Metal3 setting for IPMI LAN Network
-export IRONIC_IPMI_INTERFACE="eno1"