diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-31 14:36:53 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-31 14:37:26 -0500 |
| commit | ec07b10b209d4a5cf076bafd716b2bfc33bdeb59 (patch) | |
| tree | 34f23139c2d546da6c0b0c7ffcc20eb3d3fbf6d3 | |
| parent | 75d9c8775da0c9378386cd7f0f461a08cda88183 (diff) | |
modfiied as per test result.
Change-Id: I8679e382cb1ed7b6e3ce0f7a130663c37eb65837
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rwxr-xr-x | ci/01-deploybundle.sh | 7 | ||||
| -rwxr-xr-x | ci/nosdn/fetch-charms.sh | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index e07ca0ed..6f6f0e27 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -132,11 +132,12 @@ for feature in $5; do sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml ;; 'dpdk' ) - sed -i -- 's/#dpdk_enable: true/dpdk_enable: true/g' ./bundles.yaml - sed -i -- 's/#hugepages: '50%'/hugepages: '50%'/g' ./bundles.yaml + sed -i -- 's/#enable-dpdk: true/enable-dpdk: true/g' ./bundles.yaml + sed -i -- 's/#hugepages: "50%"/hugepages: "50%"/g' ./bundles.yaml + ;; 'lxd' ) sed -i -- 's/#- - nova-compute:lxd/- - nova-compute:lxd/g' ./bundles.yaml - sed -i -- 's/#- - lxd:lxd/- - lxd:lxd/g' ./bundles.yaml + sed -i -- 's/#- lxd:lxd/- lxd:lxd/g' ./bundles.yaml sed -i -- 's/#virt-type: lxd/virt-type: lxd/g' ./bundles.yaml # adding the lxd subordinate charm echo " lxd:" >> ./bundles.yaml diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index c436b674..d715bd80 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -26,3 +26,4 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat +git clone https://github.com/openstack/charm-lxd.git xenial/lxd |