no idea, commit before changes
This commit is contained in:
Neil Hanlon
parent
2968e83f5b
commit
4f0bb1f4af
GPG Key ID:
705BC21EC3C70F34
@ -37,15 +37,6 @@ global_overrides:
|
||||
net_name: "vxlan"
|
||||
group_binds:
|
||||
- neutron_linuxbridge_agent
|
||||
# - network:
|
||||
# container_bridge: "br-vlan"
|
||||
# container_type: "veth"
|
||||
# container_interface: "eth12"
|
||||
# host_bind_override: "eth12"
|
||||
# type: "flat"
|
||||
# net_name: "flat"
|
||||
# group_binds:
|
||||
# - neutron_linuxbridge_agent
|
||||
- network:
|
||||
container_bridge: "br-storage"
|
||||
container_type: "veth"
|
||||
@ -71,14 +62,6 @@ x-storage-hosts: &x-storage-hosts
|
||||
container_vars:
|
||||
cinder_backends:
|
||||
limit_container_types: cinder_volume
|
||||
#nfs_volume:
|
||||
# volume_backend_name: NFS_VOLUME1
|
||||
# volume_driver: cinder.volume.drivers.nfs.NfsDriver
|
||||
# nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
|
||||
# nfs_shares_config: /etc/cinder/nfs_shares
|
||||
# shares:
|
||||
# - ip: "172.29.228.7"
|
||||
# share: "/vol/cinder"
|
||||
lvm:
|
||||
volume_group: cinder-volumes
|
||||
volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
|
||||
@ -94,6 +77,7 @@ repo-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
haproxy_hosts:
|
||||
<<: *x-infra-hosts
|
||||
|
||||
##
|
||||
## OpenStack
|
||||
##
|
||||
|
||||
109
ansible/playbooks/files/openstack_user_config.yml.ceph
Normal file
109
ansible/playbooks/files/openstack_user_config.yml.ceph
Normal file
@ -0,0 +1,109 @@
|
||||
---
|
||||
cidr_networks:
|
||||
container: 172.29.220.0/22
|
||||
tunnel: 172.29.224.0/22
|
||||
storage: 172.29.228.0/22
|
||||
|
||||
used_ips:
|
||||
- "172.29.220.1,172.29.220.50"
|
||||
- "172.29.224.1,172.29.224.50"
|
||||
- "172.29.228.1,172.29.228.50"
|
||||
|
||||
|
||||
global_overrides:
|
||||
# The internal and external VIP should be different IPs, however they
|
||||
# do not need to be on separate networks.
|
||||
external_lb_vip_address: 172.29.220.10
|
||||
internal_lb_vip_address: 172.29.220.11
|
||||
management_bridge: "br-mgmt"
|
||||
provider_networks:
|
||||
- network:
|
||||
container_bridge: "br-mgmt"
|
||||
container_type: "veth"
|
||||
container_interface: "eth1"
|
||||
ip_from_q: "container"
|
||||
type: "raw"
|
||||
group_binds:
|
||||
- all_containers
|
||||
- hosts
|
||||
is_container_address: true
|
||||
- network:
|
||||
container_bridge: "br-vxlan"
|
||||
container_type: "veth"
|
||||
container_interface: "eth10"
|
||||
ip_from_q: "tunnel"
|
||||
type: "vxlan"
|
||||
range: "1:1000"
|
||||
net_name: "vxlan"
|
||||
group_binds:
|
||||
- neutron_linuxbridge_agent
|
||||
- network:
|
||||
container_bridge: "br-storage"
|
||||
container_type: "veth"
|
||||
container_interface: "eth2"
|
||||
ip_from_q: "storage"
|
||||
type: "raw"
|
||||
group_binds:
|
||||
- glance_api
|
||||
- cinder_api
|
||||
- cinder_volume
|
||||
- nova_compute
|
||||
|
||||
|
||||
x-infra-hosts: &x-infra-hosts
|
||||
infra1:
|
||||
ip: 172.29.220.5
|
||||
x-compute-hosts: &x-compute-hosts
|
||||
compute1:
|
||||
ip: 172.29.220.6
|
||||
x-storage-hosts: &x-storage-hosts
|
||||
storage1:
|
||||
ip: 172.29.220.7
|
||||
storage2:
|
||||
ip: 172.29.220.8
|
||||
storage3:
|
||||
ip: 172.29.220.9
|
||||
|
||||
##
|
||||
## Ceph
|
||||
##
|
||||
ceph-mon_hosts:
|
||||
<<: *x-storage-hosts
|
||||
ceph-osd_hosts:
|
||||
<<: *x-storage-hosts
|
||||
ceph-rgw_hosts:
|
||||
<<: *x-storage-hosts
|
||||
|
||||
##
|
||||
## Infrastructure
|
||||
##
|
||||
shared-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
repo-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
haproxy_hosts:
|
||||
<<: *x-infra-hosts
|
||||
|
||||
##
|
||||
## OpenStack
|
||||
##
|
||||
identity_hosts:
|
||||
<<: *x-infra-hosts
|
||||
storage-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
image_hosts:
|
||||
<<: *x-infra-hosts
|
||||
placement-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
compute-infra_hosts:
|
||||
<<: *x-infra-hosts
|
||||
orchestration_hosts:
|
||||
<<: *x-infra-hosts
|
||||
dashboard_hosts:
|
||||
<<: *x-infra-hosts
|
||||
network_hosts:
|
||||
<<: *x-infra-hosts
|
||||
compute_hosts:
|
||||
<<: *x-compute-hosts
|
||||
storage_hosts:
|
||||
<<: *x-infra-hosts
|
||||
15
ansible/playbooks/files/user_graylog.yml
Normal file
15
ansible/playbooks/files/user_graylog.yml
Normal file
@ -0,0 +1,15 @@
|
||||
graylog_password_secret: "%QGWQASqrneb&qNpkSHp2bnis7hdw$jG2XcP5n9tDX@wpN2XA2*wskunfzA@6MDWpEbpT7Qsc#KFS26KR4n$XiCR7m$43^*v"
|
||||
graylog_root_username: "admin"
|
||||
graylog_root_password_sha2: "665903cabea02680f8b71807b7c2e1a1698507f71654316fadba6966948a002c" # The output of `echo -n yourpassword | shasum -a 256`
|
||||
haproxy_extra_services:
|
||||
- service:
|
||||
haproxy_service_name: graylog
|
||||
haproxy_backend_nodes: "{{ [groups['graylog_hosts'][0]] | default([]) }}"
|
||||
haproxy_ssl: "{{ haproxy_ssl }}"
|
||||
haproxy_port: 9000
|
||||
haproxy_balance_type: http
|
||||
haproxy_backend_arguments:
|
||||
- "http-request set-header X-Graylog-Server-URL https://{{ external_lb_vip_address }}:9000"
|
||||
|
||||
graylog_targets:
|
||||
- "{{ groups['graylog_hosts'][0] }}:12201"
|
||||
@ -61,7 +61,7 @@
|
||||
chdir: /opt/openstack-ansible/
|
||||
creates: /etc/openstack_deploy/
|
||||
environment:
|
||||
SCENARIO: "{{ SCENARIO | default('aio_metal') }}"
|
||||
SCENARIO: "{{ SCENARIO | default('aio_lxc') }}"
|
||||
tags:
|
||||
- bootstrap
|
||||
- aio
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
tags: repos
|
||||
|
||||
- name: fetch patch
|
||||
ansible.builtin.shell: 'git fetch https://review.opendev.org/openstack/openstack-ansible refs/changes/73/823573/8 && git checkout FETCH_HEAD'
|
||||
ansible.builtin.shell: 'git fetch https://review.opendev.org/openstack/openstack-ansible refs/changes/73/823573/13 && git checkout FETCH_HEAD'
|
||||
args:
|
||||
chdir: /opt/openstack-ansible/
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user