make things work

This commit is contained in:
Cedric Girard 2018-11-14 14:22:27 +01:00
parent 07e2253a1e
commit a62407958f
2 changed files with 28 additions and 25 deletions

View file

@ -3,7 +3,7 @@
openshift_deployment_type: origin
#openshift_repos_enable_testing: true
#openshift_deployment_type: openshift-enterprise
#openshift_release: v3.5
openshift_release: v3.11
# Default domain to access the applications running on OpenShift.
# This uses the `openshift_openstack_clusterid`
@ -48,25 +48,25 @@ openshift_hosted_registry_wait: True
## Openstack credentials
#openshift_cloudprovider_kind: openstack
#openshift_cloudprovider_openstack_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
#openshift_cloudprovider_openstack_username: "{{ lookup('env','OS_USERNAME') }}"
#openshift_cloudprovider_openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
#openshift_cloudprovider_openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
#openshift_cloudprovider_openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
#openshift_cloudprovider_openstack_blockstorage_version: v2
openshift_cloudprovider_kind: openstack
openshift_cloudprovider_openstack_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
openshift_cloudprovider_openstack_username: "{{ lookup('env','OS_USERNAME') }}"
openshift_cloudprovider_openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
openshift_cloudprovider_openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
openshift_cloudprovider_openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
openshift_cloudprovider_openstack_blockstorage_version: v2
# Optionally specify a local openstack.conf
#openshift_cloudprovider_openstack_conf_file: /path/to/openstack.conf
## Use Cinder volume for Openshift registry:
#openshift_hosted_registry_storage_kind: openstack
#openshift_hosted_registry_storage_access_modes: ['ReadWriteOnce']
#openshift_hosted_registry_storage_openstack_filesystem: xfs
#openshift_hosted_registry_storage_volume_size: 10Gi
openshift_hosted_registry_storage_kind: openstack
openshift_hosted_registry_storage_access_modes: ['ReadWriteOnce']
openshift_hosted_registry_storage_openstack_filesystem: xfs
openshift_hosted_registry_storage_volume_size: 10Gi
## If you want a Cinder volume created automaticaly, uncomment this:
#openshift_hosted_registry_storage_volume_name: registry
openshift_hosted_registry_storage_volume_name: registry
## If you're using a Cinder volume you've set up yourself, uncomment this:
#openshift_hosted_registry_storage_openstack_volumeID: e0ba2d73-d2f9-4514-a3b2-a0ced507fa05

View file

@ -1,6 +1,6 @@
---
openshift_openstack_clusterid: "openshift"
openshift_openstack_public_dns_domain: "example.com"
openshift_openstack_public_dns_domain: "devolab.lan"
openshift_openstack_dns_nameservers: []
# # Used Hostnames
@ -13,7 +13,7 @@ openshift_openstack_dns_nameservers: []
#openshift_openstack_etcd_hostname: "etcd"
openshift_openstack_keypair_name: "openshift"
openshift_openstack_external_network_name: "public"
openshift_openstack_external_network_name: "external"
#openshift_openstack_private_network_name: "openshift-ansible-{{ openshift_openstack_stack_name }}-net"
# # A dedicated Neutron network name for containers data network
# # Configures the data network to be separated from openshift_openstack_private_network_name
@ -99,7 +99,7 @@ openshift_openstack_external_network_name: "public"
#openshift_openstack_node_image_name: "centos7"
#openshift_openstack_lb_image_name: "centos7"
#openshift_openstack_etcd_image_name: "centos7"
openshift_openstack_default_image_name: "centos7"
openshift_openstack_default_image_name: "Centos7"
openshift_openstack_num_masters: 1
openshift_openstack_num_infra: 1
@ -109,11 +109,11 @@ openshift_openstack_num_nodes: 2
# # Public IP Allocation
# # - manage which node roles are allocated public IP addresses
# # - by default, all roles are given Public IP addresses
#openshift_openstack_master_floating_ip: true
#openshift_openstack_infra_floating_ip: true
#openshift_openstack_etcd_floating_ip: true
#openshift_openstack_load_balancer_floating_ip: true
#openshift_openstack_compute_floating_ip: true
openshift_openstack_master_floating_ip: false
openshift_openstack_infra_floating_ip: false
openshift_openstack_etcd_floating_ip: false
openshift_openstack_load_balancer_floating_ip: false
openshift_openstack_compute_floating_ip: false
# # Used Flavors
# # - set specific flavors for roles by uncommenting corresponding lines
@ -124,7 +124,7 @@ openshift_openstack_num_nodes: 2
#openshift_openstack_node_flavor: "m1.medium"
#openshift_openstack_lb_flavor: "m1.medium"
#openshift_openstack_etcd_flavor: "m1.medium"
openshift_openstack_default_flavor: "m1.medium"
openshift_openstack_default_flavor: "medium"
# # Numerical index of nodes to remove
# openshift_openstack_nodes_to_remove: []
@ -155,11 +155,14 @@ openshift_openstack_docker_volume_size: "15"
# The Classless Inter-Domain Routing (CIDR) for the OpenStack VM subnet.
openshift_openstack_subnet_cidr: "192.168.99.0/24"
#openshift_openstack_subnet_cidr: "192.168.0.0/24"
# The starting IP address for the OpenStack subnet allocation pool.
openshift_openstack_pool_start: "192.168.99.3"
#openshift_openstack_pool_start: "192.168.0.3"
# The ending IP address for the OpenStack subnet allocation pool.
openshift_openstack_pool_end: "192.168.99.254"
#openshift_openstack_pool_end: "192.168.0.254"
openshift_openstack_router_name: openshift-router
openshift_openstack_node_subnet_name: openshift
## Red Hat subscription using user/password
#rhsub_user: '<username>'