From: Narinder Gupta Date: Fri, 13 Nov 2015 02:02:24 +0000 (-0600) Subject: change the name of ubuntu compute metadata charm. Also X-Git-Tag: brahmaputra.1.0~138 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f20e3cfe7f160904f863896e7078da420cc6b05a;p=joid.git change the name of ubuntu compute metadata charm. Also Adjusted the external port Author: Author: Narinder Gupta Change-Id: I52146286e86d29e3caa40631eb0b79b110c25739 --- diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index f9fb5f06..9252ce61 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -28,7 +28,7 @@ case "$3" in # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host @@ -40,7 +40,7 @@ case "$3" in # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host diff --git a/ci/trusty/ubuntu-nodes-compute/metadata.yaml b/ci/trusty/ubuntu-nodes-compute/metadata.yaml index 8a57c088..24626c71 100644 --- a/ci/trusty/ubuntu-nodes-compute/metadata.yaml +++ b/ci/trusty/ubuntu-nodes-compute/metadata.yaml @@ -1,4 +1,4 @@ -name: ubuntu-nodes-controller +name: ubuntu-nodes-compute summary: A pristine Ubuntu Server maintainer: Charmers description: |