Move OVB settings to tripleo-quickstart-extras
The OVB settings were kept in an internal repo. Since settings for public clouds can be added to the extras repo, where open settings can be used, access to private repos should not be needed. Note that the user will still have to source a rc file to access resources on a tenant. Change-Id: Id625c2a60811fafb353519ad9bf976fc7bdea826
This commit is contained in:
Ronelle Landy
parent
64ae28d927
commit
517fb31201
25
config/environments/rdocloud-ci.yml
Normal file
25
config/environments/rdocloud-ci.yml
Normal file
@ -0,0 +1,25 @@
|
||||
os_username: "{{ lookup('env','OS_USERNAME') }}"
|
||||
os_password: "{{ lookup('env','OS_PASSWORD') }}"
|
||||
os_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
|
||||
os_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
|
||||
|
||||
cloud_name: rdocloud
|
||||
latest_guest_image:
|
||||
newton: CentOS-7-x86_64-GenericCloud-1701
|
||||
ocata: CentOS-7-x86_64-GenericCloud-1701
|
||||
master: CentOS-7-x86_64-GenericCloud-1701
|
||||
|
||||
bmc_flavor: ci.m1.small
|
||||
baremetal_flavor: ci.m1.large
|
||||
undercloud_flavor: ci.m1.large
|
||||
provision_net_cidr: 192.168.24.0/24
|
||||
|
||||
custom_nameserver:
|
||||
- 8.8.8.8
|
||||
undercloud_undercloud_nameservers: 8.8.8.8
|
||||
external_net: '38.145.32.0/22'
|
||||
overcloud_dns_servers: ["8.8.8.8", "8.8.4.4"]
|
||||
ntp_server: 'pool.ntp.org'
|
||||
|
||||
# temp disabling introspection on rdocloud
|
||||
step_introspect: false
|
||||
25
config/environments/rdocloud.yml
Normal file
25
config/environments/rdocloud.yml
Normal file
@ -0,0 +1,25 @@
|
||||
os_username: "{{ lookup('env','OS_USERNAME') }}"
|
||||
os_password: "{{ lookup('env','OS_PASSWORD') }}"
|
||||
os_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
|
||||
os_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
|
||||
|
||||
cloud_name: rdocloud
|
||||
latest_guest_image:
|
||||
newton: CentOS-7-x86_64-GenericCloud-1701
|
||||
ocata: CentOS-7-x86_64-GenericCloud-1701
|
||||
master: CentOS-7-x86_64-GenericCloud-1701
|
||||
|
||||
bmc_flavor: m1.small
|
||||
baremetal_flavor: m1.large
|
||||
undercloud_flavor: m1.large
|
||||
provision_net_cidr: 192.168.24.0/24
|
||||
|
||||
custom_nameserver:
|
||||
- 8.8.8.8
|
||||
undercloud_undercloud_nameservers: 8.8.8.8
|
||||
external_net: '38.145.32.0/22'
|
||||
overcloud_dns_servers: ["8.8.8.8", "8.8.4.4"]
|
||||
ntp_server: 'pool.ntp.org'
|
||||
|
||||
# temp disabling introspection on rdocloud
|
||||
step_introspect: false
|
||||
73
config/general_config/ovb-ha-multiple-nics.yml
Normal file
73
config/general_config/ovb-ha-multiple-nics.yml
Normal file
@ -0,0 +1,73 @@
|
||||
environment_type: ovb_host_cloud
|
||||
|
||||
# undercloud.conf
|
||||
undercloud_network_cidr: 192.168.24.0/24
|
||||
undercloud_local_ip: 192.168.24.1/24
|
||||
undercloud_network_gateway: 192.168.24.1
|
||||
undercloud_undercloud_public_vip: 192.168.24.2
|
||||
undercloud_undercloud_admin_vip: 192.168.24.3
|
||||
undercloud_local_interface: eth1
|
||||
undercloud_masquerade_network: 192.168.24.0/24
|
||||
undercloud_dhcp_start: 192.168.24.5
|
||||
undercloud_dhcp_end: 192.168.24.24
|
||||
undercloud_inspection_iprange: 192.168.24.25,192.168.24.39
|
||||
|
||||
# template copies
|
||||
undercloud_instackenv_template: "{{ local_working_dir }}/instackenv.json"
|
||||
baremetal_nic_configs: "{{ local_working_dir }}/openstack-virtual-baremetal/network-templates/nic-configs"
|
||||
network_environment_file: "ovb-multiple-nics.yaml"
|
||||
image_cache_dir: "{{ working_dir }}/images-cache"
|
||||
|
||||
# baremetal settings
|
||||
overcloud_nodes:
|
||||
node_count: 4
|
||||
undercloud_type: ovb
|
||||
step_introspect: true
|
||||
step_root_device_size: false
|
||||
hw_env: ovb_host_cloud
|
||||
network_isolation_type: multiple-nics
|
||||
network_isolation: true
|
||||
enable_vbmc: false
|
||||
ovb_setup_connectivity: true
|
||||
hostname_correction: true
|
||||
|
||||
# adjust mtus
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
- eth2
|
||||
|
||||
# set up external interface
|
||||
external_interface: eth2
|
||||
external_interface_ip: 10.0.0.1
|
||||
external_interface_netmask: 255.255.255.0
|
||||
|
||||
# images to copy to the undercloud
|
||||
images:
|
||||
- name: overcloud-full
|
||||
url: "{{ overcloud_image_url }}"
|
||||
type: tar
|
||||
- name: ipa_images
|
||||
url: "{{ ipa_image_url }}"
|
||||
type: tar
|
||||
|
||||
# overcloud deployment settings
|
||||
validation_args: " "
|
||||
extra_args: " --control-flavor baremetal --compute-flavor baremetal --control-scale 3 \
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml \
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
|
||||
-e ~/network-environment.yaml --ntp-server {{ ntp_server }} "
|
||||
|
||||
run_tempest: false
|
||||
tempest_config: false
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
|
||||
# validate / tempest config
|
||||
floating_ip_cidr: 10.0.0.0/24
|
||||
public_net_pool_start: 10.0.0.50
|
||||
public_net_pool_end: 10.0.0.100
|
||||
public_net_gateway: 10.0.0.1
|
||||
|
||||
73
config/general_config/ovb-minimal-pacemaker-public-bond.yml
Normal file
73
config/general_config/ovb-minimal-pacemaker-public-bond.yml
Normal file
@ -0,0 +1,73 @@
|
||||
environment_type: ovb_host_cloud
|
||||
|
||||
# undercloud.conf
|
||||
undercloud_network_cidr: 192.168.24.0/24
|
||||
undercloud_local_ip: 192.168.24.1/24
|
||||
undercloud_network_gateway: 192.168.24.1
|
||||
undercloud_undercloud_public_vip: 192.168.24.2
|
||||
undercloud_undercloud_admin_vip: 192.168.24.3
|
||||
undercloud_local_interface: eth1
|
||||
undercloud_masquerade_network: 192.168.24.0/24
|
||||
undercloud_dhcp_start: 192.168.24.5
|
||||
undercloud_dhcp_end: 192.168.24.24
|
||||
undercloud_inspection_iprange: 192.168.24.25,192.168.24.39
|
||||
|
||||
# template copies
|
||||
undercloud_instackenv_template: "{{ local_working_dir }}/instackenv.json"
|
||||
baremetal_nic_configs: "{{ local_working_dir }}/openstack-virtual-baremetal/bond-network-templates/nic-configs"
|
||||
network_environment_file: "ovb-public-bond.yaml"
|
||||
image_cache_dir: "{{ working_dir }}/images-cache"
|
||||
|
||||
# baremetal settings
|
||||
overcloud_nodes:
|
||||
node_count: 2
|
||||
undercloud_type: ovb
|
||||
step_introspect: true
|
||||
step_root_device_size: false
|
||||
hw_env: ovb_host_cloud
|
||||
network_isolation_type: public-bond
|
||||
network_isolation: true
|
||||
enable_vbmc: false
|
||||
ovb_setup_connectivity: true
|
||||
hostname_correction: true
|
||||
|
||||
# adjust mtus
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
- eth2
|
||||
|
||||
# set up external interface
|
||||
external_interface: eth2
|
||||
external_interface_ip: 10.0.0.1
|
||||
external_interface_netmask: 255.255.255.0
|
||||
|
||||
# images to copy to the undercloud
|
||||
images:
|
||||
- name: overcloud-full
|
||||
url: "{{ overcloud_image_url }}"
|
||||
type: tar
|
||||
- name: ipa_images
|
||||
url: "{{ ipa_image_url }}"
|
||||
type: tar
|
||||
|
||||
# overcloud deployment settings
|
||||
validation_args: " "
|
||||
extra_args: " --control-flavor baremetal --compute-flavor baremetal \
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml \
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
|
||||
-e ~/network-environment.yaml --ntp-server {{ ntp_server }} "
|
||||
|
||||
run_tempest: false
|
||||
tempest_config: false
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
|
||||
# validate / tempest config
|
||||
floating_ip_cidr: 10.0.0.0/24
|
||||
public_net_pool_start: 10.0.0.50
|
||||
public_net_pool_end: 10.0.0.100
|
||||
public_net_gateway: 10.0.0.1
|
||||
|
||||
25
roles/overcloud-prep-config/templates/ovb-multiple-nics.yaml
Normal file
25
roles/overcloud-prep-config/templates/ovb-multiple-nics.yaml
Normal file
@ -0,0 +1,25 @@
|
||||
resource_registry:
|
||||
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControlPlaneSubnetCidr: '24'
|
||||
ControlPlaneDefaultRoute: 192.168.24.1
|
||||
EC2MetadataIp: 192.168.24.1
|
||||
ExternalNetCidr: 10.0.0.0/24
|
||||
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
|
||||
ExternalInterfaceDefaultRoute: 10.0.0.1
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
InternalApiNetCidr: 172.20.0.0/24
|
||||
InternalApiAllocationPools: [{"start": "172.20.0.10", "end": "172.20.0.250"}]
|
||||
StorageNetCidr: 172.18.0.0/24
|
||||
StorageAllocationPools: [{"start": "172.18.0.10", "end": "172.18.0.250"}]
|
||||
StorageMgmtNetCidr: 172.19.0.0/24
|
||||
StorageMgmtAllocationPools: [{"start": "172.19.0.10", "end": "172.19.0.250"}]
|
||||
TenantNetCidr: 172.16.0.0/24
|
||||
TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
|
||||
DnsServers: "8.8.8.8"
|
||||
PublicVirtualFixedIPs: [{ "ip_address": "10.0.0.5" }]
|
||||
26
roles/overcloud-prep-config/templates/ovb-public-bond.yaml
Normal file
26
roles/overcloud-prep-config/templates/ovb-public-bond.yaml
Normal file
@ -0,0 +1,26 @@
|
||||
resource_registry:
|
||||
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControlPlaneSubnetCidr: '24'
|
||||
ControlPlaneDefaultRoute: 192.168.24.1
|
||||
EC2MetadataIp: 192.168.24.1
|
||||
ExternalNetCidr: 10.0.0.0/24
|
||||
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
|
||||
ExternalInterfaceDefaultRoute: 10.0.0.1
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
InternalApiNetCidr: 172.20.0.0/24
|
||||
InternalApiAllocationPools: [{"start": "172.20.0.10", "end": "172.20.0.250"}]
|
||||
StorageNetCidr: 172.18.0.0/24
|
||||
StorageAllocationPools: [{"start": "172.18.0.10", "end": "172.18.0.250"}]
|
||||
StorageMgmtNetCidr: 172.19.0.0/24
|
||||
StorageMgmtAllocationPools: [{"start": "172.19.0.10", "end": "172.19.0.250"}]
|
||||
TenantNetCidr: 172.16.0.0/24
|
||||
TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
|
||||
DnsServers: "8.8.8.8"
|
||||
BondInterfaceOvsOptions: bond_mode=balance-slb
|
||||
PublicVirtualFixedIPs: [{ "ip_address": "10.0.0.5" }]
|
||||
Loading…
x
Reference in New Issue
Block a user