Additions to install OpenStack Octavia
- Adds Octavia AIO config - Adds group vars to trigger config of LBaaS/Ocatvia in neutron if Octavia is installed - Adds Octavia endpoint to haproxy - Adds Octavia vars and secrets - Adds Octavia to repository - adjusts tests - adds reno Depends-On: Idb419a4ca5daa311d39c90eda5f83412ccf576ad Change-Id: Ia334ed42ed0664b10cba860d4231a6aa1588800e
This commit is contained in:
parent
3f6d6253fd
commit
daf20d0961
@ -186,3 +186,7 @@
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-osd
|
||||
version: master
|
||||
- name: os_octavia
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
|
||||
version: master
|
4
etc/openstack_deploy/conf.d/octavia.yml.aio
Normal file
4
etc/openstack_deploy/conf.d/octavia.yml.aio
Normal file
@ -0,0 +1,4 @@
|
||||
# The controller host that the octavia control plane will be run on
|
||||
octavia_hosts:
|
||||
aio1:
|
||||
ip: 172.29.236.100
|
@ -103,6 +103,12 @@ nova_placement_container_mysql_password:
|
||||
# LXD Options for nova compute
|
||||
lxd_trust_password:
|
||||
|
||||
## Octavia Options
|
||||
octavia_container_mysql_password:
|
||||
octavia_service_password:
|
||||
octavia_health_hmac_key:
|
||||
octavia_rabbitmq_password:
|
||||
|
||||
## Sahara Options
|
||||
sahara_container_mysql_password:
|
||||
sahara_rabbitmq_password:
|
||||
|
@ -221,3 +221,9 @@ trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
|
||||
trove_dashboard_git_install_branch: a485b5d79f2fcdc8d37cf61f5043c3d3a4a60313 # HEAD of "master" as of 03.03.2017
|
||||
trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
|
||||
trove_dashboard_git_project_group: horizon_all
|
||||
|
||||
## Octavia service
|
||||
octavia_git_repo: https://git.openstack.org/openstack/octavia
|
||||
octavia_git_install_branch: f7426dcf96874b6e3ce15009d251866f6de01116 # HEAD of "master" as of `28.2.2017
|
||||
ocatvia_git_dest: "/opt/octavia_{{ octavia_git_install_branch | replace('/', '_') }}"
|
||||
octavia_git_project_group: octavia_all
|
||||
|
49
playbooks/inventory/env.d/octavia.yml
Normal file
49
playbooks/inventory/env.d/octavia.yml
Normal file
@ -0,0 +1,49 @@
|
||||
---
|
||||
# Copyright 2017, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
component_skel:
|
||||
octavia-api:
|
||||
belongs_to:
|
||||
- octavia_all
|
||||
octavia-worker:
|
||||
belongs_to:
|
||||
- octavia_all
|
||||
octavia-housekeeping:
|
||||
belongs_to:
|
||||
- octavia_all
|
||||
octavia-health-manager:
|
||||
belongs_to:
|
||||
- octavia_all
|
||||
|
||||
|
||||
container_skel:
|
||||
octavia_server_container:
|
||||
belongs_to:
|
||||
- octavia-infra_containers
|
||||
contains:
|
||||
- octavia-api
|
||||
- octavia-worker
|
||||
- octavia-housekeeping
|
||||
- octavia-health-manager
|
||||
properties:
|
||||
service_name: octavia
|
||||
|
||||
physical_skel:
|
||||
octavia-infra_containers:
|
||||
belongs_to:
|
||||
- all_containers
|
||||
octavia_hosts:
|
||||
belongs_to:
|
||||
- hosts
|
@ -392,6 +392,25 @@ nova_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['
|
||||
# If there are any Barbican hosts in the environment, then enable its usage
|
||||
nova_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
|
||||
|
||||
## Octavia
|
||||
octavia_service_port: 9876
|
||||
octavia_service_proto: http
|
||||
octavia_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(octavia_service_proto) }}"
|
||||
octavia_service_internaluri: "{{ octavia_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
|
||||
octavia_service_internalurl: "{{ octavia_service_internaluri }}/v1/%(tenant_id)s"
|
||||
|
||||
octavia_service_user_name: octavia
|
||||
octavia_service_url: "{{ octavia_service_internaluri }}"
|
||||
|
||||
# RPC
|
||||
octavia_rabbitmq_userid: octavia
|
||||
octavia_rabbitmq_vhost: /octavia
|
||||
octavia_rabbitmq_port: "{{ rabbitmq_port }}"
|
||||
octavia_rabbitmq_servers: "{{ rabbitmq_servers }}"
|
||||
octavia_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
|
||||
octavia_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
|
||||
|
||||
|
||||
## Sahara
|
||||
#RPC
|
||||
sahara_rabbitmq_userid: sahara
|
||||
|
@ -26,3 +26,5 @@ neutron_package_state: "{{ package_state }}"
|
||||
# venv fetch configuration
|
||||
neutron_venv_tag: "{{ venv_tag }}"
|
||||
neutron_venv_download_url: "{{ venv_base_download_url }}/neutron-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
|
||||
|
||||
neutron_lbaas_octavia: "{{ (groups['octavia_all'] is defined) and (groups['octavia_all'] | length > 0) }}"
|
||||
|
19
playbooks/inventory/group_vars/octavia_all.yml
Normal file
19
playbooks/inventory/group_vars/octavia_all.yml
Normal file
@ -0,0 +1,19 @@
|
||||
---
|
||||
# Copyright 2017, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
# venv fetch configuration
|
||||
octavia_venv_tag: "{{ venv_tag }}"
|
||||
octavia_bin: "/openstack/venvs/octavia-{{ octavia_venv_tag }}/bin"
|
||||
octavia_venv_download_url: "{{ venv_base_download_url }}/octavia-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
|
68
playbooks/os-octavia-install.yml
Normal file
68
playbooks/os-octavia-install.yml
Normal file
@ -0,0 +1,68 @@
|
||||
---
|
||||
# Copyright 2017, Rackspace US, Inc.
|
||||
#
|
||||
# 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 octavia server
|
||||
hosts: octavia_all
|
||||
gather_facts: "{{ gather_facts | default(True) }}"
|
||||
max_fail_percentage: 20
|
||||
user: root
|
||||
pre_tasks:
|
||||
- include: common-tasks/os-lxc-container-setup.yml
|
||||
static: no
|
||||
- include: common-tasks/rabbitmq-vhost-user.yml
|
||||
static: no
|
||||
vars:
|
||||
user: "{{ octavia_rabbitmq_userid }}"
|
||||
password: "{{ octavia_rabbitmq_password }}"
|
||||
vhost: "{{ octavia_rabbitmq_vhost }}"
|
||||
_rabbitmq_host_group: "{{ octavia_rabbitmq_host_group }}"
|
||||
when:
|
||||
- inventory_hostname == groups['octavia_all'][0]
|
||||
- groups[octavia_rabbitmq_host_group] | length > 0
|
||||
- include: common-tasks/os-log-dir-setup.yml
|
||||
vars:
|
||||
log_dirs:
|
||||
- src: "/openstack/log/{{ inventory_hostname }}-octavia"
|
||||
dest: "/var/log/octavia"
|
||||
- include: common-tasks/mysql-db-user.yml
|
||||
static: no
|
||||
vars:
|
||||
user_name: "{{ octavia_galera_user }}"
|
||||
password: "{{ octavia_container_mysql_password }}"
|
||||
login_host: "{{ octavia_galera_address }}"
|
||||
db_name: "{{ octavia_galera_database }}"
|
||||
when: inventory_hostname == groups['octavia_all'][0]
|
||||
- include: common-tasks/package-cache-proxy.yml
|
||||
roles:
|
||||
- role: "os_octavia"
|
||||
- role: "openstack_openrc"
|
||||
tags:
|
||||
- openrc
|
||||
- role: "rsyslog_client"
|
||||
rsyslog_client_log_rotate_file: octavia_log_rotate
|
||||
rsyslog_client_log_dir: "/var/log/ocgtavia"
|
||||
rsyslog_client_config_name: " 100-octavia-rsyslog-client.conf"
|
||||
tags:
|
||||
- rsyslog
|
||||
- role: "system_crontab_coordination"
|
||||
tags:
|
||||
- crontab
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
octavia_galera_user: octavia
|
||||
octavia_galera_database: octavia
|
||||
octavia_galera_address: "{{ galera_address }}"
|
||||
tags:
|
||||
- octavia
|
@ -266,3 +266,14 @@ haproxy_default_services:
|
||||
- "forwardfor"
|
||||
- "httpchk /versions"
|
||||
- "httplog"
|
||||
- service:
|
||||
haproxy_service_name: octavia
|
||||
haproxy_backend_nodes: "{{ groups['octavia_all'] | default([]) }}"
|
||||
haproxy_port: 9876
|
||||
haproxy_balance_type: http
|
||||
haproxy_backend_options:
|
||||
- "httpchk GET /"
|
||||
haproxy_whitelist_networks:
|
||||
- 192.168.0.0/16
|
||||
- 172.16.0.0/12
|
||||
- 10.0.0.0/8
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- Experimental support has been added to allow the deployment of
|
||||
the OpenStack Octavia Load Balancing service when hosts are present
|
||||
in the host group ``octavia_hosts``.
|
@ -257,6 +257,14 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
|
||||
'magnum-infra_hosts',
|
||||
'magnum_all',
|
||||
'magnum_container',
|
||||
'octavia_hosts',
|
||||
'octavia_all',
|
||||
'octavia-api',
|
||||
'octavia_server_container',
|
||||
'octavia-worker',
|
||||
'octavia-housekeeping',
|
||||
'octavia-health-manager',
|
||||
'octavia-infra_containers',
|
||||
'trove_all',
|
||||
'trove_api',
|
||||
'trove_conductor',
|
||||
|
Loading…
Reference in New Issue
Block a user