summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/00-maasdeploy.sh16
-rw-r--r--ci/config_tpl/bundle_tpl/ceph.yaml12
-rw-r--r--ci/default_deployment_config.yaml2
-rw-r--r--labconfig/intel/pod9/labconfig.yaml6
4 files changed, 24 insertions, 12 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh
index 98ca47af..14937730 100755
--- a/ci/00-maasdeploy.sh
+++ b/ci/00-maasdeploy.sh
@@ -221,7 +221,7 @@ enableautomodebyname() {
if [ ! -z "$4" ]; then
for i in `seq 1 7`;
do
- nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4`
+ nodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
if [ ! -z "$nodes" ]; then
maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3
fi
@@ -255,14 +255,14 @@ crnodevlanint() {
case "$labname" in
'intelpod9' )
maas refresh
- crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true
- crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true
- crnodevlanint $vlan902 eth0 || true
+ crvlanupdsubnet vlan904 fabric-1 "MgmtNetwork" 904 2 || true
+ crvlanupdsubnet vlan905 fabric-2 "PublicNetwork" 905 3 || true
crnodevlanint $vlan905 eth1 || true
- enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true
- enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true
- enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true
- enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true
+ crnodevlanint $vlan905 eth3 || true
+ enableautomodebyname eth1.905 AUTO "10.9.15.0/24" || true
+ enableautomodebyname eth3.905 AUTO "10.9.15.0/24" || true
+ enableautomodebyname eth0 AUTO "10.9.12.0/24" || true
+ enableautomodebyname eth2 AUTO "10.9.12.0/24" || true
;;
esac
diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml
index da1e8b54..10b96843 100644
--- a/ci/config_tpl/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/bundle_tpl/ceph.yaml
@@ -10,9 +10,21 @@
#ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
{% endif %}
to:
+{% if os.hyperconverged %}
{% for unit_id in to_select(unit_ceph_qty()) %}
- "lxc:nodes={{ unit_id }}"
{% endfor %}
+{% else %}
+{% if os.ha.mode == 'ha' %}
+{% for unit_id in range(0, 3) %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+{% else %}
+ - "lxc:nodes=0"
+ - "lxc:nodes=0"
+ - "lxc:nodes=0"
+{% endif %}
+{% endif %}
ceph-osd:
charm: "local:{{ ubuntu.release }}/ceph-osd"
{% if os.hyperconverged %}
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index 10001fe3..e6250c8a 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -9,7 +9,7 @@ os:
lxd: False
region: RegionOne
api:
- worker_multiplier: 2
+ worker_multiplier: 0.5
haproxy_timeout: 10000
admin:
role: admin
diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 55897611..62175432 100644
--- a/labconfig/intel/pod9/labconfig.yaml
+++ b/labconfig/intel/pod9/labconfig.yaml
@@ -112,7 +112,7 @@ lab:
user: root
pass: root
floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.1,10.9.15.0/24
- ext-port: "eth3"
+ ext-port: "eth1.905"
dns: 8.8.8.8
osdomainname:
opnfv:
@@ -139,8 +139,8 @@ opnfv:
vlan:
- type: public
bridge: brPublic
- cidr: 10.9.13.0/24
- gateway: 10.9.13.1
+ cidr: 10.9.15.0/24
+ gateway: 10.9.15.1
vlan:
- type: external
bridge: brExt