From 4b9a4f89021fe3c4dbf3394f46c72edc4668a83f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 1 Jul 2016 23:40:41 -0500 Subject: [PATCH] modify the lab definition as per new changes. Change-Id: Ib559b16d8cedab4feb86681300846d900ae4dcdd Signed-off-by: Narinder Gupta --- ci/bundle_tpl/mysql.yaml | 7 ++++--- ci/nosdn/fetch-charms.sh | 3 +-- ci/odl/fetch-charms.sh | 2 +- ci/onos/fetch-charms.sh | 2 +- ci/opencontrail/fetch-charms.sh | 2 +- labconfig/intel/pod5/labconfig.yaml | 30 ++++++++++++++++++++++++------ labconfig/intel/pod6/labconfig.yaml | 32 +++++++++++++++++++++++++------- 7 files changed, 57 insertions(+), 21 deletions(-) diff --git a/ci/bundle_tpl/mysql.yaml b/ci/bundle_tpl/mysql.yaml index 4835dfe6..6317608d 100644 --- a/ci/bundle_tpl/mysql.yaml +++ b/ci/bundle_tpl/mysql.yaml @@ -2,14 +2,15 @@ charm: "local:{{ ubuntu.release }}/percona-cluster" num_units: {{ unit_qty() }} options: - dataset-size: 2G - lp1366997-workaround: true - max-connections: 10000 + innodb-buffer-pool-size: 2G + #lp1366997-workaround: true + #max-connections: 20000 root-password: {{ get_password('mysql_root') }} sst-password: {{ get_password('mysql_sst') }} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.mysql }} {% endif %} + min-cluster-size: {{ unit_qty() }} to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index d170e0e7..498ad8c4 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -23,8 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -#git clone -b bug/congress-fix https://github.com/gnuoy/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index dc1c7fe3..2a42b6a8 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -23,7 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 97d109b1..ea48c90e 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -23,7 +23,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index d25881b7..8b6c5ba1 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -25,7 +25,7 @@ git clone https://github.com/openstack/charm-cinder.git $distro/cinder git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone -git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster #git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index 7e90ed26..d9aa7471 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -18,7 +18,7 @@ lab: mac: ["90:E2:BA:85:4E:2D"] power: type: ipmi - address: 10.2.117.81 + address: 10.2.117.85 user: root pass: root - name: rack-5-m2 @@ -36,7 +36,7 @@ lab: mac: ["90:E2:BA:84:08:B9"] power: type: ipmi - address: 10.2.117.82 + address: 10.2.117.86 user: root pass: root - name: rack-5-m3 @@ -54,7 +54,7 @@ lab: mac: ["90:E2:BA:84:07:0E"] power: type: ipmi - address: 10.2.117.83 + address: 10.2.117.87 user: root pass: root - name: rack-5-m4 @@ -72,7 +72,7 @@ lab: mac: ["90:E2:BA:83:FD:81"] power: type: ipmi - address: 10.2.117.84 + address: 10.2.117.88 user: root pass: root - name: rack-5-m5 @@ -90,9 +90,27 @@ lab: mac: ["90:E2:BA:75:22:75"] power: type: ipmi - address: 10.2.117.85 + address: 10.2.117.89 user: root pass: root +# - name: rack-5-m6 +# architecture: x86_64 +# roles: [compute,storage] +# nics: +# - ifname: eth1 +# spaces: [admin] +# mac: ["98:4F:EE:10:03:43"] +# - ifname: eth4 +# spaces: [data] +# mac: ["00:1E:67:9C:3E:54"] +# - ifname: eth5 +# spaces: [public] +# mac: ["00:1E:67:9C:3E:55"] +# power: +# type: ipmi +# address: 10.2.117.90 +# user: root +# pass: root floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.254,10.5.15.0/24 ext-port: "eth5" dns: 8.8.8.8 @@ -106,7 +124,7 @@ opnfv: - type: nosdn storage: - type: ceph - disk: /srv + disk: /dev/sdb feature: odl_l2 spaces: - type: admin diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml index 54223f07..37a87ec7 100644 --- a/labconfig/intel/pod6/labconfig.yaml +++ b/labconfig/intel/pod6/labconfig.yaml @@ -18,7 +18,7 @@ lab: mac: ["90:E2:BA:83:FD:21"] power: type: ipmi - address: 10.2.117.96 + address: 10.2.117.101 user: root pass: root - name: rack-6-m2 @@ -36,7 +36,7 @@ lab: mac: ["90:E2:BA:75:30:F5"] power: type: ipmi - address: 10.2.117.97 + address: 10.2.117.102 user: root pass: root - name: rack-6-m3 @@ -54,7 +54,7 @@ lab: mac: ["90:E2:BA:83:FE:75"] power: type: ipmi - address: 10.2.117.98 + address: 10.2.117.103 user: root pass: root - name: rack-6-m4 @@ -72,7 +72,7 @@ lab: mac: ["90:E2:BA:84:15:7D"] power: type: ipmi - address: 10.2.117.99 + address: 10.2.117.104 user: root pass: root - name: rack-6-m5 @@ -90,9 +90,27 @@ lab: mac: ["90:E2:BA:84:08:F5"] power: type: ipmi - address: 10.2.117.100 + address: 10.2.117.105 user: root pass: root +# - name: rack-6-m6 +# architecture: x86_64 +# roles: [compute,storage] +# nics: +# - ifname: eth1 +# spaces: [admin] +# mac: ["98:4F:EE:10:01:D6"] +# - ifname: eth4 +# spaces: [data] +# mac: ["00:1E:67:9C:3E:A4] +# - ifname: eth5 +# spaces: [public] +# mac: ["00:1E:67:9C:3E:A5] +# power: +# type: ipmi +# address: 10.2.117.106 +# user: root +# pass: root floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.254,10.6.15.0/24 ext-port: "eth5" dns: 8.8.8.8 @@ -106,7 +124,7 @@ opnfv: - type: nosdn storage: - type: ceph - disk: /srv + disk: /dev/sdb feature: odl_l2 spaces: - type: admin @@ -128,5 +146,5 @@ opnfv: bridge: brExt cidr: gateway: - ipaddress: 10.2.117.107 + ipaddress: 10.2.117.108 vlan: -- 2.16.6