Add Calico networking AIO scenario

Depends-On: I47543778487b6a9a2972b29d270d199a4d1e9b61
Change-Id: Iaf392898c072ac4b39d878bb27654406c5ab0d8b
This commit is contained in:
Logan V 2019-03-22 14:24:15 -04:00
parent 3cd040ab84
commit 68eb88caa4
7 changed files with 83 additions and 0 deletions

View File

@ -0,0 +1,4 @@
---
etcd_hosts:
aio1:
ip: 172.29.236.100

View File

@ -0,0 +1,32 @@
---
# Copyright 2019, Logan Vig <logan2211@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Add the calico dhcp agents to the compute hosts
component_skel:
neutron_calico_dhcp_agent:
belongs_to:
- neutron_all
container_skel:
neutron_agents_container:
contains: {}
neutron_calico_dhcp_agent_container:
belongs_to:
- compute_containers
contains:
- neutron_calico_dhcp_agent
properties:
is_metal: true

View File

@ -37,6 +37,7 @@ export RSYNC_CMD="rsync --archive --copy-links --ignore-errors --quiet --no-perm
# easy for folks to find and adjust items as needed.
COMMON_ETC_LOG_NAMES="apt \
apache2 \
calico \
haproxy \
httpd \
memcached \

View File

@ -179,6 +179,9 @@
- src: user_variables_manila.yml.j2
dest: user_variables_manila.yml
condition: "{{ 'manila' in bootstrap_host_scenarios_expanded }}"
- src: user_variables_calico.yml.j2
dest: user_variables_calico.yml
condition: "{{ 'calico' in bootstrap_host_scenarios_expanded }}"
- name: Copy modified cinder-volume env.d file for ceph scenario
copy:
@ -194,6 +197,13 @@
when:
- "'metal' in bootstrap_host_scenarios"
- name: Copy modified env.d file for calico scenario
copy:
src: "{{ playbook_dir }}/../etc/openstack_deploy/env.d/calico.yml.example"
dest: "/etc/openstack_deploy/env.d/calico.yml"
when:
- "'calico' in bootstrap_host_scenarios"
- name: Create vars override folders if we need to test them
file:
path: "{{ item }}"

View File

@ -0,0 +1,33 @@
---
# Copyright 2019, Logan Vig <logan2211@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
nova_network_type: calico
neutron_plugin_type: ml2.calico
neutron_provider_networks:
network_types: local
# NOTE(logan): This is a workaroun for a bug in networking-calico, which
# sends None as the user and project domain name if none is specified in
# neutron.conf.
neutron_neutron_conf_overrides:
keystone_authtoken:
user_domain_name: Default
project_domain_name: Default
tempest_private_net_provider_type: "local"
tempest_private_net_seg_id: ''
tempest_public_net_provider_type: "local"
tempest_public_net_physical_type: ''

View File

@ -32,6 +32,9 @@ bootstrap_host_scenarios_expanded: |-
{% endif %}
{% endif %}
{# Service additions based on scenario presence #}
{% if 'calico' in bootstrap_host_scenarios %}
{% set _ = scenario_list.extend(['etcd']) %}
{% endif %}
{% if 'ironic' in bootstrap_host_scenarios %}
{% set _ = scenario_list.extend(['swift']) %}
{% endif %}