diff options
23 files changed, 273 insertions, 32 deletions
diff --git a/ci/build.sh b/ci/build.sh index fde0cfe4e..f15c52951 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -71,6 +71,7 @@ pushd "${DOCKER_DIR}" > /dev/null pipenv --two pipenv install pipenv install invoke +# shellcheck disable=SC2086 pipenv run \ invoke build saltmaster-reclass \ --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ @@ -79,7 +80,7 @@ pipenv run \ --formula-rev=nightly \ --opnfv-tag="${DOCKER_TAG}" \ --salt='stable 2017.7' \ - "${DOCKER_PUSH}" + ${DOCKER_PUSH} popd > /dev/null diff --git a/ci/deploy.sh b/ci/deploy.sh index 0e084d295..4b6b916ac 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -305,12 +305,16 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then else prepare_vms "${base_image}" "${MCP_STORAGE_DIR}" "${virtual_repos_pkgs}" \ "${virtual_nodes[@]}" - prepare_containers "${MCP_STORAGE_DIR}" create_networks "${OPNFV_BRIDGES[@]}" do_sysctl_cfg do_udev_cfg create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}" start_vms "${virtual_nodes[@]}" + + # https://github.com/docker/libnetwork/issues/1743 + # rm -f /var/lib/docker/network/files/local-kv.db + sudo systemctl restart docker + prepare_containers "${MCP_STORAGE_DIR}" fi start_containers "${MCP_STORAGE_DIR}" diff --git a/docs/release/scenarios/index.rst b/docs/release/scenarios/index.rst index f42c83b6f..20bab6be6 100644 --- a/docs/release/scenarios/index.rst +++ b/docs/release/scenarios/index.rst @@ -14,3 +14,7 @@ Scenarios for Fuel\@OPNFV os-nosdn-ovs-noha/index.rst os-nosdn-ovs-ha/index.rst + os-ovn-nofeature-noha/index.rst + os-ovn-nofeature-ha/index.rst + os-nosdn-vpp-noha/index.rst + os-nosdn-vpp-ha/index.rst diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst index af0105b81..723e83be4 100644 --- a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst +++ b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst @@ -2,7 +2,7 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 -.. (c) 2017 Mirantis Inc., Enea Software AB and others +.. (c) 2018 Mirantis Inc., Enea Software AB and others ======================================== os-nosdn-ovs-ha overview and description diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst index eda89412f..73b691b92 100644 --- a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst +++ b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst @@ -1,15 +1,15 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -.. (c)2017 Mirantis Inc., Enea Software AB and others +.. (c) 2018 Mirantis Inc., Enea Software AB and others -This document provides scenario level details for Fraser 6.2 of +This document provides scenario level details for Gambia 7.0 of deployment with no SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment without any NFV features or SDN controller enabled. Scenario components and composition @@ -27,8 +27,8 @@ per service. Scenario usage overview ======================= -Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy -settings file. +Simply deploy this scenario by setting os-nosdn-ovs-ha as scenario +deploy parameter. Limitations, Issues and Workarounds =================================== @@ -38,5 +38,5 @@ None References ========== -For more information on the OPNFV Fraser release, please visit +For more information on the OPNFV Gambia release, please visit http://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst index 066abc938..9726dd07e 100644 --- a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst +++ b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst @@ -2,7 +2,7 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 -.. (c) 2017 Mirantis Inc., Enea Software AB and others +.. (c) 2018 Mirantis Inc., Enea Software AB and others ========================================== os-nosdn-ovs-noha overview and description diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst index 0e5239675..99a980662 100644 --- a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst +++ b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst @@ -1,15 +1,15 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -.. (c) 2017 Mirantis Inc., Enea Software AB and others +.. (c) 2018 Mirantis Inc., Enea Software AB and others -This document provides scenario level details for Fraser 6.2 of +This document provides scenario level details for Gambia 7.0 of deployment with no SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment without any NFV features or SDN controller enabled. @@ -24,8 +24,8 @@ the DPDK-enabled Open vSwitch component. Scenario usage overview ======================= -Simply deploy this scenario by using the os-nosdn-ovs-noha.yaml deploy -settings file. +Simply deploy this scenario by setting os-nosdn-ovs-noha as scenario +deploy parameter. Limitations, Issues and Workarounds @@ -36,5 +36,5 @@ Tested on virtual deploy only. References ========== -For more information on the OPNFV Fraser release, please visit +For more information on the OPNFV Gambia release, please visit http://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/index.rst b/docs/release/scenarios/os-nosdn-vpp-ha/index.rst new file mode 100644 index 000000000..a17c272a8 --- /dev/null +++ b/docs/release/scenarios/os-nosdn-vpp-ha/index.rst @@ -0,0 +1,16 @@ +.. _os-nosdn-vpp-ha: + +.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +======================================== +os-nosdn-vpp-ha overview and description +======================================== + +.. toctree:: + :numbered: + :maxdepth: 2 + + os-nosdn-vpp-ha.rst + diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst b/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst new file mode 100644 index 000000000..cdad3b44e --- /dev/null +++ b/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst @@ -0,0 +1,42 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +This document provides scenario level details for Gambia 7.0 of +deployment with no SDN controller and VPP enabled as virtual switch. + +============ +Introduction +============ + +This scenario is used primarily to validate and deploy a Queens OpenStack +deployment with no SDN controller enabled and VPP as virtual switch. + +Scenario components and composition +=================================== + +This scenario is composed of common OpenStack services enabled by default, +including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs +VPP on the compute nodes as virtual switch. + +All services are in HA, meaning that there are multiple cloned instances of +each service, and they are balanced by HA Proxy using a Virtual IP Address +per service. + + +Scenario usage overview +======================= + +Simply deploy this scenario by setting os-nosdn-vpp-ha as scenario +deploy parameter. + +Limitations, Issues and Workarounds +=================================== + +None + +References +========== + +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/index.rst b/docs/release/scenarios/os-nosdn-vpp-noha/index.rst new file mode 100644 index 000000000..d6576a5e6 --- /dev/null +++ b/docs/release/scenarios/os-nosdn-vpp-noha/index.rst @@ -0,0 +1,16 @@ +.. _os-nosdn-vpp-noha: + +.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +========================================== +os-nosdn-vpp-noha overview and description +========================================== + +.. toctree:: + :numbered: + :maxdepth: 2 + + os-nosdn-vpp-noha.rst + diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst b/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst new file mode 100644 index 000000000..9154228e9 --- /dev/null +++ b/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst @@ -0,0 +1,40 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +This document provides scenario level details for Gambia 7.0 of +deployment with no SDN controller and VPP enabled as virtual switch. + +============ +Introduction +============ + +This scenario is used primarily to validate and deploy a Queens OpenStack +deployment with no SDN controller enabled and VPP as virtual switch. + + +Scenario components and composition +=================================== + +This scenario is composed of common OpenStack services enabled by default, +including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs +VPP on the compute nodes as virtual switch. + + +Scenario usage overview +======================= + +Simply deploy this scenario by setting os-nosdn-vpp-noha as scenario +deploy parameter. + + +Limitations, Issues and Workarounds +=================================== + +Tested on virtual deploy only. + +References +========== + +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/software diff --git a/docs/release/scenarios/os-ovn-nofeature-ha/index.rst b/docs/release/scenarios/os-ovn-nofeature-ha/index.rst new file mode 100644 index 000000000..704172235 --- /dev/null +++ b/docs/release/scenarios/os-ovn-nofeature-ha/index.rst @@ -0,0 +1,16 @@ +.. _os-ovn-nofeature-ha: + +.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +============================================ +os-ovn-nofeature-ha overview and description +============================================ + +.. toctree:: + :numbered: + :maxdepth: 2 + + os-ovn-nofeature-ha.rst + diff --git a/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst new file mode 100644 index 000000000..5abda9e88 --- /dev/null +++ b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst @@ -0,0 +1,42 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +This document provides scenario level details for Gambia 7.0 of deployment +with Open Virtual Network (OVN) providing Layers 2 and 3 networking and no +extra features enabled. + +============ +Introduction +============ + +This scenario is used primarily to validate and deploy a Queens OpenStack +deployment with OVN enabled and without any NFV features. + +Scenario components and composition +=================================== + +This scenario is composed of common OpenStack services enabled by default, +including Nova, Neutron, Glance, Cinder, Keystone, Horizon, plus OVN. + +All services are in HA, meaning that there are multiple cloned instances of +each service, and they are balanced by HA Proxy using a Virtual IP Address +per service. + + +Scenario usage overview +======================= + +Simply deploy this scenario by setting os-ovn-nofeature-ha as scenario +deploy parameter. + +Limitations, Issues and Workarounds +=================================== + +None + +References +========== + +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/software diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/index.rst b/docs/release/scenarios/os-ovn-nofeature-noha/index.rst new file mode 100644 index 000000000..7c5baf5bb --- /dev/null +++ b/docs/release/scenarios/os-ovn-nofeature-noha/index.rst @@ -0,0 +1,16 @@ +.. _os-ovn-nofeature-noha: + +.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +============================================== +os-ovn-nofeature-noha overview and description +============================================== + +.. toctree:: + :numbered: + :maxdepth: 2 + + os-ovn-nofeature-noha.rst + diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst new file mode 100644 index 000000000..5e6a925ce --- /dev/null +++ b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst @@ -0,0 +1,40 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2018 Mirantis Inc., Enea Software AB and others + +This document provides scenario level details for Gambia 7.0 of deployment +with Open Virtual Network (OVN) providing Layers 2 and 3 networking and no +extra features enabled. + +============ +Introduction +============ + +This scenario is used primarily to validate and deploy a Queens OpenStack +deployment with OVN enabled and without any NFV features. + + +Scenario components and composition +=================================== + +This scenario is composed of common OpenStack services enabled by default, +including Nova, Neutron, Glance, Cinder, Keystone, Horizon, plus OVN. + + +Scenario usage overview +======================= + +Simply deploy this scenario by setting os-ovn-nofeature-noha as scenario +deploy parameter. + + +Limitations, Issues and Workarounds +=================================== + +Tested on virtual deploy only. + +References +========== + +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/software diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 7e0739037..46c8bddc1 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -34,10 +34,10 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 cmp002: vcpus: 8 @@ -48,8 +48,8 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 0f6858f1e..499c1d357 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -82,7 +82,3 @@ dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \ upload_path='certs/os_cacert' | cut -d':' -f1) cd /etc/ssl/certs && \ ln -sf "/var/cache/salt/master/minions/${dashboard_host}/files/certs/os_cacert" - -# glance v1 api is required by orchestra tests -salt -I 'glance:server' ini.set_option /etc/glance/glance-api.conf '{DEFAULT: {enable_v1_api: True}}' -salt -I 'glance:server' service.restart glance-api diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index a518c6e11..120fc9ff7 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -153,9 +153,6 @@ parameters: listen: heat_cloudwatch_api: enabled: false - neutron_api: - # Set source balancing - type: heat barbican: server: ks_notifications_enable: true diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index dc286452b..79eafcd10 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -256,7 +256,7 @@ parameters: pin: - pin: 'release o=Canonical' priority: 1200 - package: 'python-pymysql libvirt* *qemu*' + package: 'libvirt* qemu* openvswitch* python-openvswitch ovn* dpdk* libdpdk*' {%- if 'aarch64' in nm.cluster.arch %} armband_3: # Should be in sync with the repo config generated via curtin/MaaS source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 index 767b30849..2707c7f5e 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 @@ -11,6 +11,7 @@ --- classes: - service.neutron.compute.single + - system.nova.compute.nfv.hugepages - cluster.mcp-common-noha.openstack_compute - cluster.mcp-ovs-noha parameters: @@ -30,3 +31,7 @@ parameters: netmask: ${_param:opnfv_net_private_mask} use_interfaces: - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} + system: + package: + cgroup-tools: + version: latest diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml index 939cb2834..dd0245344 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml @@ -10,3 +10,9 @@ classes: - system.neutron.control.openvswitch.single - cluster.mcp-common-noha.openstack_control - cluster.mcp-ovs-noha +parameters: + nova: + controller: + scheduler_default_filters: "DifferentHostFilter,SameHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,\ + CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,\ + ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter" diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml index 3a762b39a..82c141e87 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml @@ -10,11 +10,11 @@ applications: - opendaylight parameters: _param: - version: oxygen + opendaylight_version: fluorine opendaylight: server: enabled: 'True' - version: ${_param:version} - repo: 'odl-team/${_param:version}' + version: ${_param:opendaylight_version} + repo: 'odl-team/${_param:opendaylight_version}' logging: engine: syslog diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 34229df08..df35f3706 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -497,7 +497,7 @@ function prepare_containers { docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down - if [ ! "${MCP_DOCKER_TAG}" = 'verify' ]; then + if [[ ! "${MCP_DOCKER_TAG}" =~ 'verify' ]]; then "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull fi sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"* |