Project Calico integration
Integrate deployment for Project Calico's Neutron networking plugin. See http://docs.openstack.org/developer/networking-calico/ for more information about Calico. Depends-On: I80546b6deefe0878398716d173b7dcc36c3bef3a Depends-On: I02ba101a3dfdbb34b96a110f429cfa6d1f0e9863 Change-Id: I9e8e855c8aff8822878908ae75f913f0444a7303
This commit is contained in:
parent
9d9bc8aa08
commit
cebce0c020
@ -134,3 +134,11 @@
|
|||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/willshersystems/ansible-sshd
|
src: https://github.com/willshersystems/ansible-sshd
|
||||||
version: master
|
version: master
|
||||||
|
- name: bird
|
||||||
|
scm: git
|
||||||
|
src: https://github.com/logan2211/ansible-bird
|
||||||
|
version: master
|
||||||
|
- name: etcd
|
||||||
|
scm: git
|
||||||
|
src: https://github.com/logan2211/ansible-etcd
|
||||||
|
version: master
|
||||||
|
22
playbooks/defaults/repo_packages/projectcalico.yml
Normal file
22
playbooks/defaults/repo_packages/projectcalico.yml
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, 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.
|
||||||
|
|
||||||
|
calico_git_repo: https://github.com/projectcalico/calico
|
||||||
|
calico_git_install_branch: master
|
||||||
|
calico_git_project_group: neutron_all
|
||||||
|
|
||||||
|
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
|
||||||
|
networking_calico_git_install_branch: master
|
||||||
|
networking_calico_git_project_group: neutron_all
|
31
playbooks/etcd-install.yml
Normal file
31
playbooks/etcd-install.yml
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, 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.
|
||||||
|
|
||||||
|
- name: Install etcd server cluster
|
||||||
|
hosts: etcd_all
|
||||||
|
gather_facts: "{{ gather_facts | default(True) }}"
|
||||||
|
max_fail_percentage: 20
|
||||||
|
user: root
|
||||||
|
pre_tasks:
|
||||||
|
- include: common-tasks/os-lxc-container-setup.yml
|
||||||
|
- include: common-tasks/package-cache-proxy.yml
|
||||||
|
roles:
|
||||||
|
- role: "etcd"
|
||||||
|
etcd_install_type: server
|
||||||
|
tags:
|
||||||
|
- etcd-server
|
||||||
|
- role: "system_crontab_coordination"
|
||||||
|
vars:
|
||||||
|
is_metal: "{{ properties.is_metal|default(false) }}"
|
@ -97,6 +97,11 @@
|
|||||||
neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"
|
neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"
|
||||||
tags:
|
tags:
|
||||||
- "os-neutron"
|
- "os-neutron"
|
||||||
|
- role: "bird"
|
||||||
|
when:
|
||||||
|
- "'neutron_calico_dhcp_agent' in group_names"
|
||||||
|
tags:
|
||||||
|
- "bird"
|
||||||
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
|
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
|
||||||
- role: "rsyslog_client"
|
- role: "rsyslog_client"
|
||||||
rsyslog_client_log_rotate_file: neutron_log_rotate
|
rsyslog_client_log_rotate_file: neutron_log_rotate
|
||||||
|
@ -18,5 +18,6 @@
|
|||||||
- include: memcached-install.yml
|
- include: memcached-install.yml
|
||||||
- include: galera-install.yml
|
- include: galera-install.yml
|
||||||
- include: rabbitmq-install.yml
|
- include: rabbitmq-install.yml
|
||||||
|
- include: etcd-install.yml
|
||||||
- include: utility-install.yml
|
- include: utility-install.yml
|
||||||
- include: rsyslog-install.yml
|
- include: rsyslog-install.yml
|
||||||
|
5
releasenotes/notes/neutron-calico-2332b0972708af8a.yaml
Normal file
5
releasenotes/notes/neutron-calico-2332b0972708af8a.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- The Project Calico Neutron networking plugin is now integrated into the
|
||||||
|
deployment. For setup instructions please see ``os_neutron`` role
|
||||||
|
documentation.
|
Loading…
x
Reference in New Issue
Block a user