From a32cc255a7680f47217c767878f0294fd5d5b679 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Wed, 29 Dec 2021 21:57:45 -0500 Subject: [PATCH] Moved these into ansible --- terraform/files/openstack_user_config.yml | 192 ---------------------- terraform/files/user_lxc.yml | 4 - 2 files changed, 196 deletions(-) delete mode 100644 terraform/files/openstack_user_config.yml delete mode 100644 terraform/files/user_lxc.yml diff --git a/terraform/files/openstack_user_config.yml b/terraform/files/openstack_user_config.yml deleted file mode 100644 index 550db1b..0000000 --- a/terraform/files/openstack_user_config.yml +++ /dev/null @@ -1,192 +0,0 @@ ---- -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-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" - 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 - infra1: - ip: 172.29.220.7 - container_vars: - cinder_backends: - limit_container_types: cinder_volume - lvm: - volume_group: cinder-volumes - volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver - volume_backend_name: LVM_iSCSI - iscsi_ip_address: "172.29.228.7" - -## -## 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-storage-hosts - -### -### Infrastructure -### - - ## galera, memcache, rabbitmq, utility - #shared-infra_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## repository (apt cache, python packages, etc) - #repo-infra_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## load balancer - #haproxy_hosts: - # infra1: - # ip: 172.29.220.5 - # - #### - #### OpenStack - #### - # - ## keystone - #identity_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## cinder api services - #storage-infra_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## glance - #image_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## placement - #placement-infra_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## nova api, conductor, etc services - #compute-infra_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## heat - #orchestration_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## horizon - #dashboard_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## neutron server, agents (L3, etc) - #network_hosts: - # infra1: - # ip: 172.29.220.5 - # - ## nova hypervisors - #compute_hosts: - # compute1: - # ip: 172.29.220.6 - # - ## cinder storage host (LVM-backed) - #storage_hosts: - # storage1: - # ip: 172.29.220.7 - # container_vars: - # cinder_backends: - # limit_container_types: cinder_volume - # lvm: - # volume_group: cinder-volumes - # volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver - # volume_backend_name: LVM_iSCSI - # iscsi_ip_address: "172.29.228.7" diff --git a/terraform/files/user_lxc.yml b/terraform/files/user_lxc.yml deleted file mode 100644 index 1139a3f..0000000 --- a/terraform/files/user_lxc.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -lxc_container_base_name: "rocky-8-amd64" -lxc_hosts_container_build_command: "dnf --assumeyes --installroot=/var/lib/machines/{{ lxc_container_base_name }} install --setopt=install_weak_deps=False --nodocs rootfiles coreutils dnf rocky-release rocky-repos --releasever=8" -