Merge "Doc updates for MS6"

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index aa32926..d2aaa36 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -86,9 +86,12 @@ URL=https://images.maas.io/ephemeral-v2/daily/
 KEYRING_FILE=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
 SOURCE_ID=1
 FABRIC_ID=1
-VLAN_TAG=""
 PRIMARY_RACK_CONTROLLER="$MAAS_IP"
 SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.cidr | cut -d \" -f 2 `
+SUBNETDATA_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.cidr | cut -d \" -f 2 `
+SUBNETPUB_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="public")'.cidr | cut -d \" -f 2 `
+SUBNETSTOR_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="storage")'.cidr | cut -d \" -f 2 `
+SUBNETFLOAT_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="floating")'.cidr | cut -d \" -f 2 `
 VLAN_TAG="untagged"
 
 # In the case of a virtual deployment get deployconfig.yaml
@@ -191,6 +194,7 @@ configuremaas(){
     #reconfigure maas with correct MAAS address.
     #Below code is needed as MAAS have issue in commisoning without restart.
     sudo ./maas-reconfigure-region.sh $MAAS_IP
+    sleep 30
     sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS
 
     sudo maas createadmin --username=ubuntu --email=ubuntu@ubuntu.com --password=ubuntu || true
@@ -202,45 +206,37 @@ configuremaas(){
     maas $PROFILE maas set-config name='ntp_server' value='ntp.ubuntu.com' || true
     maas $PROFILE sshkeys create "key=$SSH_KEY" || true
 
-    maas $PROFILE tags create name='bootstrap' || true
-    maas $PROFILE tags create name='compute' || true
-    maas $PROFILE tags create name='control' || true
-    maas $PROFILE tags create name='storage' || true
+    for tag in bootstrap compute control storage
+    do
+        maas $PROFILE tags create name=$tag || true
+    done
 
     #create the required spaces.
     maas $PROFILE space update 0 name=default || true
-    maas $PROFILE spaces create name=unused || true
-    maas $PROFILE spaces create name=admin-api || true
-    maas $PROFILE spaces create name=internal-api || true
-    maas $PROFILE spaces create name=public-api || true
-    maas $PROFILE spaces create name=compute-data || true
-    maas $PROFILE spaces create name=compute-external || true
-    maas $PROFILE spaces create name=storage-data || true
-    maas $PROFILE spaces create name=storage-cluster || true
-
-    maas $PROFILE boot-source update $SOURCE_ID \
-         url=$URL keyring_filename=$KEYRING_FILE || true
+    for space in unused admin-api internal-api public-api compute-data \
+                 compute-external storage-data storage-cluster
+    do
+        echo "Creating the space $space"
+        maas $PROFILE spaces create name=$space || true
+    done
 
-    maas $PROFILE boot-resources import || true
-    sleep 10
+    #maas $PROFILE boot-source update $SOURCE_ID \
+    #     url=$URL keyring_filename=$KEYRING_FILE || true
+    #maas $PROFILE boot-resources import || true
+    #sleep 60
 
     while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
     do
         sleep 60
     done
-
-    #maas $PROFILE subnet update vlan:<vlan id> name=internal-api space=<0> gateway_ip=10.5.1.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=admin-api space=<2> gateway_ip=10.5.12.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=public-api space=<1> gateway_ip=10.5.15.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=compute-data space=<3> gateway_ip=10.5.17.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=compute-external space=<4> gateway_ip=10.5.19.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=storage-data space=<5> gateway_ip=10.5.20.1
-    #maas $PROFILE subnet update vlan:<vlan id> name=storage-cluster space=<6> gateway_ip=10.5.21.1
-
 }
 
 enablesubnetanddhcp(){
-    SUBNET_PREFIX=${SUBNET_CIDR::-5}
+    TEMP_CIDR=$1
+    enabledhcp=$2
+    space=$3
+
+    SUBNET_PREFIX=${TEMP_CIDR::-5}
 
     IP_RES_RANGE_LOW="$SUBNET_PREFIX.1"
     IP_RES_RANGE_HIGH="$SUBNET_PREFIX.39"
@@ -259,23 +255,57 @@ enablesubnetanddhcp(){
         start_ip=$IP_DYNAMIC_RANGE_LOW end_ip=$IP_DYNAMIC_RANGE_HIGH \
         comment='This is a reserved dynamic range' || true
 
-
-    FABRIC_ID=$(maas $PROFILE subnet read $SUBNET_CIDR | jq '.vlan.fabric_id')
+    FABRIC_ID=$(maas $PROFILE subnet read $TEMP_CIDR | jq '.vlan.fabric_id')
 
     PRIMARY_RACK_CONTROLLER=$(maas $PROFILE rack-controllers read | jq -r '.[0].system_id')
 
-    maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
-
-    MY_GATEWAY=`cat deployconfig.json | jq '.opnfv.admNetgway' | cut -d \" -f 2`
-    MY_NAMESERVER=`cat deployconfig.json | jq '.opnfv.upstream_dns' | cut -d \" -f 2`
-    maas $PROFILE subnet update $SUBNET_CIDR gateway_ip=$MY_GATEWAY || true
-    maas $PROFILE subnet update $SUBNET_CIDR dns_servers=$MY_NAMESERVER || true
-
-    #below command will enable the interface with internal-api space.
-
-    SPACEID=$(maas $PROFILE space read internal-api | jq '.id')
-    maas $PROFILE subnet update $SUBNET_CIDR space=$SPACEID || true
-
+    if [ "$space" == "admin" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.gateway | cut -d \" -f 2 `
+        #MY_NAMESERVER=`cat deployconfig.json | jq '.opnfv.upstream_dns' | cut -d \" -f 2`
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #maas $PROFILE subnet update $TEMP_CIDR dns_servers=$MY_NAMESERVER || true
+        #below command will enable the interface with internal-api space.
+        SPACEID=$(maas $PROFILE space read internal-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "data" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.gateway | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with data-api space for data network.
+        SPACEID=$(maas $PROFILE space read admin-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "public" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.public | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with public-api space for data network.
+        SPACEID=$(maas $PROFILE space read public-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "storage" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.storage | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with public-api space for data network.
+        SPACEID=$(maas $PROFILE space read storage-data | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    fi
 }
 
 addnodes(){
@@ -332,49 +362,27 @@ addnodes(){
     maas $PROFILE tag update-nodes bootstrap add=$bootstrapid
 
     if [ "$virtinstall" -eq 1 ]; then
+        units=`cat deployconfig.json | jq .opnfv.units`
 
-        sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --cpu host --vcpus 4 \
+        until [ $(($units)) -lt 1 ]; do
+           units=$(($units - 1));
+           NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
+
+            sudo virt-install --connect qemu:///system --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
                      --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                     $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
-
-        sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --cpu host --vcpus 4 \
-                    --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                    $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
-
-        sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --cpu host --vcpus 4 \
-                   --disk size=120,format=qcow2,bus=virtio,io=native,pool=default \
-                   $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
-
-
-        node1controlmac=`grep  "mac address" node1-control | head -1 | cut -d '"' -f 2`
-        node2computemac=`grep  "mac address" node2-compute | head -1 | cut -d '"' -f 2`
-        node5computemac=`grep  "mac address" node5-compute | head -1 | cut -d '"' -f 2`
-
-        sudo virsh -c qemu:///system define --file node1-control
-        sudo virsh -c qemu:///system define --file node2-compute
-        sudo virsh -c qemu:///system define --file node5-compute
-        rm -f node1-control node2-compute node5-compute
-
-
-        maas $PROFILE machines create autodetect_nodegroup='yes' name='node1-control' \
-            tags='control' hostname='node1-control' power_type='virsh' mac_addresses=$node1controlmac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node1-control'
-        controlnodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node1-control").system_id')
-        maas $PROFILE machines create autodetect_nodegroup='yes' name='node2-compute' \
-            tags='compute' hostname='node2-compute' power_type='virsh' mac_addresses=$node2computemac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node2-compute'
-        compute2nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node2-compute").system_id')
-        maas $PROFILE machines create autodetect_nodegroup='yes' name='node5-compute' \
-            tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac \
-            power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
-            architecture='amd64/generic' power_parameters_power_id='node5-compute'
-        compute5nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node5-compute").system_id')
-
-        maas $PROFILE tag update-nodes control add=$controlnodeid || true
-        maas $PROFILE tag update-nodes compute add=$compute2nodeid || true
-        maas $PROFILE tag update-nodes compute add=$compute5nodeid || true
+                     $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME
+
+            nodemac=`grep  "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2`
+            sudo virsh -c qemu:///system define --file $NODE_NAME
+            rm -f $NODE_NAME
+            maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
+                tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \
+                power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+                architecture='amd64/generic' power_parameters_power_id=$NODE_NAME
+            nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == '\"$NODE_NAME\"').system_id')
+            maas $PROFILE tag update-nodes control add=$nodeid || true
+            maas $PROFILE tag update-nodes compute add=$nodeid || true
+        done
     else
        units=`cat deployconfig.json | jq .opnfv.units`
 
@@ -405,8 +413,27 @@ addnodes(){
 #configure MAAS with the different options.
 configuremaas
 
-#not virtual lab only. Can be done using any physical pod now.
-enablesubnetanddhcp
+# functioncall with subnetid to add and second parameter is dhcp enable
+# third parameter will define the space. It is required to have admin
+
+if [ $SUBNET_CIDR ]; then
+    enablesubnetanddhcp $SUBNET_CIDR true admin
+else
+    echo "atleast admin network should be defined"
+    echo "MAAS configuration can not continue"
+    exit 2
+fi
+
+if [ $SUBNETDATA_CIDR ]; then
+    enablesubnetanddhcp $SUBNETDATA_CIDR false data
+fi
+if [ $SUBNETPUB_CIDR ]; then
+    enablesubnetanddhcp $SUBNETPUB_CIDR false public
+fi
+
+if [ $SUBNETSTOR_CIDR ]; then
+    enablesubnetanddhcp $SUBNETSTOR_CIDR false storage
+fi
 
 #just make sure rack controller has been synced and import only
 # just whether images have been imported or not.
@@ -429,9 +456,11 @@ echo "... Deployment of maas finish ...."
 enableautomode() {
     API_KEY=`sudo maas-region apikey --username=ubuntu`
     maas login $PROFILE $API_SERVERMAAS $API_KEY
+    vlanid=$(maas $PROFILE subnet read $3 | jq -r '.vlan.id')
 
     for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
     do
+        maas $PROFILE interface update $node $1 vlan=$vlanid
         maas $PROFILE interface link-subnet $node $1  mode=$2 subnet=$3 || true
     done
 }
@@ -472,8 +501,10 @@ crnodevlanint() {
 
     for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
     do
-        interface=$(maas $PROFILE interface read $node $2 | jq -r '.id')
-        maas $PROFILE interfaces create-vlan $node vlan=$1 parent=$interface
+        vlanid=$(maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.id)
+        fabricid=`maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.fabric_id`
+        interface=`maas $PROFILE interfaces read $node | jq '.[] | select(.vlan.fabric_id=='$fabricid')'.id`
+        maas $PROFILE interfaces create-vlan $node vlan=$vlanid parent=$interface || true
      done
  }
 
@@ -506,7 +537,6 @@ addcloud() {
     juju add-cloud $cloudname maas-cloud.yaml --replace
 }
 
-
 #
 # VLAN customization
 #
@@ -530,40 +560,106 @@ esac
 #
 
 #read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer.
+# Enable only non vlan interfaces first.
+if [ -e ./labconfig.json ]; then
+  if [ $SUBNETDATA_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="data")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETDATA_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETPUB_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="public")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETPUB_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETSTOR_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="storage")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} AUTO $SUBNETSTOR_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETFLOAT_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="floating")'.ifname | sort -u`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ -z $VLAN ] || [ "$VLAN" == "null" ]); then
+              enableautomode ${EXTNET[i]} link_up $SUBNETFLOAT_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+fi
 
-if [ -e ./deployconfig.yaml ]; then
-  enableiflist=`grep "interface-enable" deployconfig.yaml | cut -d ' ' -f 4 `
-  datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  stornet=`grep "storageNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  pubnet=`grep "publicNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-
-  # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
+#enable only the vlan interfaces which were ignore in previous run.
 
-  if [ "$datanet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+if [ -e ./labconfig.json ]; then
+  if [ $SUBNETDATA_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="data")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="data")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $datanet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETDATA_CIDR || true
+          fi
+          i=$[$i+1]
+      done
+  fi
+  if [ $SUBNETPUB_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="public")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="public")'.vlan`
+      i="0"
+      while [ ! -z "${EXTNET[i]}" ];
+      do
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETPUB_CIDR || true
+          fi
           i=$[$i+1]
       done
-
   fi
-  if [ "$stornet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+  if [ $SUBNETSTOR_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="storage")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="storage")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $stornet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} AUTO $SUBNETSTOR_CIDR || true
+          fi
           i=$[$i+1]
       done
   fi
-  if [ "$pubnet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
+  if [ $SUBNETFLOAT_CIDR ]; then
+      EXTNET=`cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[].nics[] | select(.spaces[]=="floating")'.ifname | sort -u`
+      VLAN=`cat labconfig.json | jq --raw-output '.opnfv.spaces[] | select(.type=="floating")'.vlan`
       i="0"
       while [ ! -z "${EXTNET[i]}" ];
       do
-          enableautomode ${EXTNET[i]} AUTO $pubnet || true
+          if ([ $VLAN ] && [ "$VLAN" != "null" ]); then
+              crnodevlanint $VLAN || true
+              enableautomode ${EXTNET[i]} link_up $SUBNETFLOAT_CIDR || true
+          fi
           i=$[$i+1]
       done
   fi

diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
index 27c0e87..a4633fc 100644 (file)
--- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
@@ -1,6 +1,10 @@
     easyrsa:
       charm: "cs:~containers/easyrsa"
       num_units: 1
+{% if os.service.bindings %}
+      bindings:
+        "": internal-api
+{% endif %}
       to:
         - "lxd:nodes/0"
 

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 84209f4..ff4886e 100755 (executable)
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -13,7 +13,7 @@ function build {
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
-charm pull cs:~narindergupta/charm-neutron-gateway-0 $distro/neutron-gateway
+charm pull cs:~narindergupta/neutron-gateway-0 $distro/neutron-gateway
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress

diff --git a/labconfig/cengn/pod1/labconfig.yaml b/labconfig/cengn/pod1/labconfig.yaml
index 6773e82..2d34467 100644 (file)
--- a/labconfig/cengn/pod1/labconfig.yaml
+++ b/labconfig/cengn/pod1/labconfig.yaml
@@ -11,7 +11,7 @@ lab:
         spaces: [admin]
         mac: ["00:A0:A5:90:89:66"]
       - ifname: enp12s0
-        spaces: [public]
+        spaces: [floating]
         mac: ["00:A0:A5:90:89:67"]
       - ifname: enp3s0f1
         spaces: [data]
@@ -29,7 +29,7 @@ lab:
         spaces: [admin]
         mac: ["00:A0:A5:90:89:A8"]
       - ifname: enp12s0
-        spaces: [public]
+        spaces: [floating]
         mac: ["00:A0:A5:90:89:A9"]
       - ifname: enp3s0f1
         spaces: [data]
@@ -47,7 +47,7 @@ lab:
         spaces: [admin]
         mac: ["00:A0:A5:90:89:28"]
       - ifname: enp12s0
-        spaces: [public]
+        spaces: [floating]
         mac: ["00:A0:A5:90:89:29"]
       - ifname: enp3s0f1
         spaces: [data]
@@ -65,7 +65,7 @@ lab:
         spaces: [admin]
         mac: ["00:A0:A5:89:30:C6"]
       - ifname: enp12s0
-        spaces: [public]
+        spaces: [floating]
         mac: ["00:A0:A5:89:30:C7"]
       - ifname: enp3s0f1
         spaces: [data]
@@ -83,7 +83,7 @@ lab:
         spaces: [admin]
         mac: ["00:A0:A5:90:89:94"]
       - ifname: enp12s0
-        spaces: [public]
+        spaces: [floating]
         mac: ["00:A0:A5:90:89:95"]
       - ifname: enp3s0f1
         spaces: [data]
@@ -122,5 +122,5 @@ opnfv:
   - type: data
     bridge: brData
     cidr: 192.168.20.0/24
-    gateway: 192.168.20.1
+    gateway: 192.168.20.254
     vlan:
\ No newline at end of file

diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 2d65c7a..8ed4532 100644 (file)
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -7,15 +7,21 @@ lab:
       architecture: x86_64
       roles: [network,control]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:CF:BB:54"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: eth5
+      - ifname: ens785f1.504
         spaces: [public]
         mac: ["90:E2:BA:85:4E:2D"]
+      - ifname: ens785f0.505
+        spaces: [floating]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.85
@@ -25,15 +31,21 @@ lab:
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:CF:B8:93"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:84:08:B8"]
-      - ifname: eth5
+      - ifname: ens785f1.504
         spaces: [public]
         mac: ["90:E2:BA:84:08:B9"]
+      - ifname: ens785f0.505
+        spaces: [floating]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.86
@@ -43,15 +55,21 @@ lab:
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:08:7F"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:84:07:0D"]
-      - ifname: eth5
+      - ifname: ens785f1.504
         spaces: [public]
         mac: ["90:E2:BA:84:07:0E"]
+      - ifname: ens785f0.505
+        spaces: [floating]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.87
@@ -61,15 +79,21 @@ lab:
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:08:B1"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:83:FD:80"]
-      - ifname: eth5
+      - ifname: ens785f1.504
         spaces: [public]
         mac: ["90:E2:BA:83:FD:81"]
+      - ifname: ens785f0.505
+        spaces: [floating]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.88
@@ -79,15 +103,21 @@ lab:
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:0A:4B"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:75:22:74"]
-      - ifname: eth5
+      - ifname: ens785f1.504
         spaces: [public]
         mac: ["90:E2:BA:75:22:75"]
+      - ifname: ens785f0.505
+        spaces: [floating]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.89
@@ -97,13 +127,13 @@ lab:
 #      architecture: x86_64
 #      roles: [compute,storage]
 #      nics:
-#      - ifname: eth1
+#      - ifname: enp4s0f3
 #        spaces: [admin]
 #        mac: ["98:4F:EE:10:03:43"]
-#      - ifname: eth4
+#      - ifname: ens785f0
 #        spaces: [data]
 #        mac: ["00:1E:67:9C:3E:54"]
-#      - ifname: eth5
+#      - ifname: ens785f1.504
 #        spaces: [public]
 #        mac: ["00:1E:67:9C:3E:55"]
 #      power:
@@ -146,12 +176,12 @@ opnfv:
       bridge: brMgmt
       cidr: 10.5.14.0/24
       gateway:
-      vlan:
+      vlan: 504
     - type: floating
       bridge: brPublic
       cidr: 10.5.15.0/24
       gateway:
-      vlan:
+      vlan: 505
     - type: external
       bridge: brExt
       cidr: