summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xci/01-deploybundle.sh7
-rw-r--r--ci/bundle_tpl/bundle.yaml13
-rw-r--r--ci/bundle_tpl/neutron-api.yaml3
-rw-r--r--ci/bundle_tpl/neutron-ovs.yaml2
-rw-r--r--ci/bundle_tpl/nova-cloud-controller.yaml1
-rw-r--r--ci/deploy.py2
-rwxr-xr-xci/nosdn/fetch-charms.sh3
-rwxr-xr-xci/odl/fetch-charms.sh3
-rwxr-xr-xci/onos/fetch-charms.sh3
-rwxr-xr-xci/opencontrail/fetch-charms.sh3
-rw-r--r--labconfig/orange/pod1/labconfig.yaml2
11 files changed, 20 insertions, 22 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 7c90fdb1..52486be6 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -154,10 +154,9 @@ fi
python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
echo "... Deployment Started ...."
- juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
- check_status
+ juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
+ #juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
+ #check_status
juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
juju ssh nodes/1 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
-
- juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 62047fba..713a6931 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -1,12 +1,9 @@
# vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}-nodes:
+{{ ubuntu.release }}-{{ os.release }}:
inherits: openstack-phase1
overrides:
{% include 'phase2-overrides.yaml' %}
-{{ ubuntu.release }}-{{ os.release }}:
- inherits: openstack-phase2
-
openstack-phase1:
services:
nodes:
@@ -48,16 +45,12 @@ openstack-phase1:
{% if os.ha.mode == 'ha' %}
{% include 'haclusters.yaml' %}
{% endif %}
+{% include 'subordinate.yaml' %}
relations:
- [ 'ntp:juju-info', 'nodes:juju-info' ]
{% if os.ha.mode == 'ha' %}
{% include 'harelations.yaml' %}
{% endif %}
-
-openstack-phase2:
- inherits: openstack-phase1
- relations:
{% include 'relations.yaml' %}
- services:
-{% include 'subordinate.yaml' %}
+
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 86c6fedf..88990cb3 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -4,7 +4,8 @@
options:
neutron-security-groups: true
{% if os.network.controller == 'nosdn' %}
- overlay-network-type: vxlan
+ flat-network-providers: "*"
+ #overlay-network-type: gre vxlan
{% elif os.network.controller == 'odl' %}
manage-neutron-plugin-legacy-mode: False
{% elif os.network.controller == 'onos' %}
diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index 20bf1d9b..446c6f25 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -1,7 +1,7 @@
neutron-openvswitch:
charm: local:{{ ubuntu.release }}/neutron-openvswitch
- options:
{% if os.network.dpdk %}
+ options:
enable-dpdk: true
#dpdk-driver: uio_pci_generic
#data-port: ""
diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 47421145..20e9bf4f 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -4,6 +4,7 @@
options:
console-access-protocol: novnc
neutron-external-network: ext-net
+ service-guard: true
{% if opnfv.domain is defined %}
console-proxy-ip: {{ opnfv.domain }}
{% endif %}
diff --git a/ci/deploy.py b/ci/deploy.py
index a7ee952f..35d3c31b 100644
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -44,7 +44,7 @@ opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\
}\
},\
'settings':{'maas_name':'','upstream_dns':'',\
- 'main_archive':"http://us.archive.ubuntu.com/ubuntu"\
+ 'main_archive':"http://archive.ubuntu.com/ubuntu"\
},\
'virsh':{'rsa_priv_key':'/home/ubuntu/.ssh/id_rsa',
'rsa_pub_key':'/home/ubuntu/.ssh/id_rsa.pub',
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 498ad8c4..130fdf0a 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -30,7 +30,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu
git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
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
+charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
+#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
git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 2a42b6a8..4593600e 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -30,7 +30,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu
git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
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
+charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
+#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/gnuoy/charm-congress.git $distro/charm-congress
git clone https://github.com/openstack/charm-lxd.git xenial/lxd
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index ea48c90e..d68a5830 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -29,7 +29,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu
git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
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
+charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
+#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/gnuoy/charm-congress.git $distro/charm-congress
build
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 8b6c5ba1..d0a4e7a8 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -32,7 +32,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu
git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
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
+charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
+#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/gnuoy/charm-congress.git $distro/charm-congress
build
diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml
index 247a1b45..f522eb9d 100644
--- a/labconfig/orange/pod1/labconfig.yaml
+++ b/labconfig/orange/pod1/labconfig.yaml
@@ -107,7 +107,7 @@ opnfv:
feature: odl_l2
storage:
- type: ceph
- disk: /dev/sdb /dev/sdc
+ disk: /dev/sdb
spaces:
- type: admin
bridge: brAdm