summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/02-maasdeploy.sh4
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-tip.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs.yaml1
4 files changed, 5 insertions, 2 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 5d00f5bb..c40cb726 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -31,9 +31,9 @@ esac
echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
if [ -e /etc/sudoers.d/90-joid-init ]; then
- cp /etc/sudoers.d/90-joid-init 91-joid-init
+ sudo cp /etc/sudoers.d/90-joid-init 91-joid-init
cat 90-joid-init >> 91-joid-init
- sudo chown root:root 90-joid-init
+ sudo chown root:root 91-joid-init
sudo mv 91-joid-init /etc/sudoers.d/
else
sudo chown root:root 90-joid-init
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index a58e7217..2b6f5093 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -132,6 +132,7 @@ openstack-phase2:
num_units: 1
options:
# "ext-port": "eth1"
+ instance-mtu: 1400
to:
- "nodes-api=0"
neutron-openvswitch:
diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml
index 66d66d5e..b78128c5 100644
--- a/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-tip.yaml
@@ -140,6 +140,7 @@ openstack-phase2:
branch: lp:charms/trusty/neutron-gateway
options:
openstack-origin-git: include-file://neutron-master.yaml
+ instance-mtu: 1400
# "ext-port": "eth1"
to:
- "nodes-api=0"
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 1d4560a6..386fbb13 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -106,6 +106,7 @@ openstack-phase2:
charm: cs:trusty/neutron-gateway
num_units: 1
options:
+ instance-mtu: 1400
# "ext-port": "eth1"
to:
- "nodes-api=0"