From 31472f1df40da38e0c9bfcb966915bfbed001789 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Wed, 21 Nov 2018 17:54:22 +0100 Subject: [PATCH] working provision and deploy inventory files --- inventory/group_vars/OSEv3.yml | 7 ++++--- inventory/group_vars/all.yml | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/OSEv3.yml b/inventory/group_vars/OSEv3.yml index f0598cf..02f1be2 100644 --- a/inventory/group_vars/OSEv3.yml +++ b/inventory/group_vars/OSEv3.yml @@ -52,9 +52,10 @@ 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_tenant_name: "{{ lookup('env','OS_PROJECT_NAME') }}" openshift_cloudprovider_openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}" -openshift_cloudprovider_openstack_blockstorage_version: v2 +openshift_cloudprovider_openstack_domain_id: "{{ lookup('env', 'OS_PROJECT_DOMAIN_ID') }}" +#openshift_cloudprovider_openstack_blockstorage_version: v2 # Optionally specify a local openstack.conf #openshift_cloudprovider_openstack_conf_file: /path/to/openstack.conf @@ -79,7 +80,7 @@ openshift_hostname_check: false # For POCs or demo environments that are using smaller instances than # the official recommended values for RAM and DISK, uncomment the line below. -#openshift_disable_check: disk_availability,memory_availability +openshift_disable_check: disk_availability,memory_availability # NOTE(shadower): Always switch to root on the OSEv3 nodes. # openshift-ansible requires an explicit `become`. diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 8216244..06b6a01 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -105,6 +105,7 @@ openshift_openstack_num_masters: 1 openshift_openstack_num_infra: 1 openshift_openstack_num_cns: 0 openshift_openstack_num_nodes: 2 +openshift_openstack_num_etcd: 0 # # Public IP Allocation # # - manage which node roles are allocated public IP addresses @@ -124,7 +125,7 @@ openshift_openstack_compute_floating_ip: false #openshift_openstack_node_flavor: "m1.medium" #openshift_openstack_lb_flavor: "m1.medium" #openshift_openstack_etcd_flavor: "m1.medium" -openshift_openstack_default_flavor: "medium" +openshift_openstack_default_flavor: "large" # # Numerical index of nodes to remove # openshift_openstack_nodes_to_remove: []