From f23cb85b739c03cc96e4bc578930f7f39db9b66a Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Thu, 7 Feb 2019 18:17:54 +0530 Subject: Add two missing deployment files These two files were missed due to improper .gitignore file data. Change-Id: I49f396c1c1d37fcbd4257bf35aaee75f41b099bc --- deployment/cns-automation-config.yaml | 53 ++++++++++++ deployment/ocp-on-vmware.ini | 151 ++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 deployment/cns-automation-config.yaml create mode 100644 deployment/ocp-on-vmware.ini (limited to 'deployment') diff --git a/deployment/cns-automation-config.yaml b/deployment/cns-automation-config.yaml new file mode 100644 index 00000000..8d24006d --- /dev/null +++ b/deployment/cns-automation-config.yaml @@ -0,0 +1,53 @@ +ocp_servers: + master: + master_ip_addr: + hostname: "master_hostname" + client: + client_ip_addr: + hostname: "client_hostname" + nodes: + node_ip_addr: + hostname: "node_hostname" + +gluster_servers: + gluster_server_ip_address1: + manage: "gluster_server_ip_hostname1" + storage: gluster_server_ip_address1 + additional_devices: ['/dev/sdg'] + gluster_server_ip_address2: + manage: "gluster_server_ip_hostname2" + storage: gluster_server_ip_address2 + additional_devices: ['/dev/sdg'] + gluster_server_ip_address3: + manage: "gluster_server_ip_hostname3" + storage: gluster_server_ip_address3 + additional_devices: ['/dev/sdg'] + +openshift: + storage_project_name: "storage" + heketi_config: + heketi_dc_name: name_of_the_heketi_deployment_config + heketi_service_name: name_of_the_heketi_service + heketi_client_node: master_ip_addr + heketi_server_url: "http://heketi.url" + heketi_cli_user: "admin" + heketi_cli_key: "secret_value_for_admin_user" + dynamic_provisioning: + storage_classes: + file_storage_class: + provisioner: "kubernetes.io/glusterfs" + resturl: "http://heketi.url" + restuser: "admin" + secretnamespace: "storage" + volumenameprefix: "autotests-file" + block_storage_class: + provisioner: "gluster.org/glusterblock" + resturl: "http://heketi.url" + restuser: "admin" + restsecretnamespace: "storage" + hacount: "3" + chapauthenabled: "true" + volumenameprefix: "autotests-block" + +common: + stop_on_first_failure: False diff --git a/deployment/ocp-on-vmware.ini b/deployment/ocp-on-vmware.ini new file mode 100644 index 00000000..3dcebac9 --- /dev/null +++ b/deployment/ocp-on-vmware.ini @@ -0,0 +1,151 @@ +[vmware] +# unique cluster_id set during script run +cluster_id= + +# console port and install type for OpenShift +console_port=8443 + +# choices are openshift-enterprise or origin +deployment_type=openshift-enterprise + +# OpenShift Version. +# Supported versions are 'v3_6', 'v3_7', 'v3_9', 'v3_10' and 'v3_11'. +openshift_vers=v3_11 + +# vCenter host address/username and password +vcenter_host= +vcenter_username=administrator@vsphere.local +vcenter_password= + +# name of RHEL template to use for OpenShift install +vcenter_template_name= + +# folder/cluster/resource pool in vCenter to organize VMs +vcenter_datacenter=CNS +vcenter_cluster= +vcenter_resource_pool=ansible_pool +vcenter_datastore= +vcenter_folder=ansible_vms + +# It is possible to enable and disable 'yum update' operation and further +# node reboot using 'disable_yum_update_and_reboot' boolean option. +# It can get any Ansible boolean-like value. +disable_yum_update_and_reboot=no + +### Docker config ### +# 'docker_registry_url' specifies main docker registry to pull images from. +# Optional. If not set, default one will be used. Example: +# docker_registry_url=myregistry.foo:5000/openshift3/ose-${component}:${version} +docker_registry_url= + +# 'docker_additional_registries' option is used to define list of +# additional registries. Optional. Example: +# docker_additional_registries=bar-registry.bar:8888,foo-registry.foo:5000 +docker_additional_registries= + +# 'docker_insecure_registries' option is used to define list of +# insecure registries. Optional. Example: +# docker_insecure_registries=bar-registry.bar:8888,foo-registry.foo:5000 +docker_insecure_registries= + +# Specify 'docker_image_tag' to install specific versions of docker images. +# Optional. Example: docker_image_tag=v3.9.3 +docker_image_tag= + +### Repositories config ### +# Specify 'ose_puddle_repo' option in case it is needed to use downstream +# repository with OpenShift packages, for example development versions. +# It should be link to the packages, not "repo" file with link to the packages. +# If defined, then GA repo will be disabled. +# Example: +# ose_puddle_repo=http://mysite.com/my_openshift_packages/3.9/latest/x86_64/os/ +ose_puddle_repo= + +# Define 'gluster_puddle_repo' option the same way as 'ose_puddle_repo', just +# for Gluster3 packages. Optional. If defined then GA repo will be disabled. +gluster_puddle_repo= + +### CNS docker options ### +# Set following options to change docker image names and their versions +# for CNS pods. Leave empty to make Ansible use default values. +cns_glusterfs_image=rhgs3/rhgs-server-rhel7 +cns_glusterfs_version=latest + +cns_glusterfs_block_image=rhgs3/rhgs-gluster-block-prov-rhel7 +cns_glusterfs_block_version=latest + +cns_glusterfs_heketi_image=rhgs3/rhgs-volmanager-rhel7 +cns_glusterfs_heketi_version=latest + +########################## + +# DNS zone where everything will be hosted and app wildcard prefix +dns_zone=openshift-on-vmware +app_dns_prefix=apps + +# Network VMWare in VMWare cluster to attach newly provisioned VMs to +vm_network="VM Network" + +# Red Hat subscription manager data +rhel_subscription_server=subscription.rhsm.stage.redhat.com:443 +rhel_subscription_user= +rhel_subscription_pass= +rhel_subscription_pool=Employee SKU + +# number of nodes of each type +compute_nodes=2 +storage_nodes=3 + +# node hostname prefix +ocp_hostname_prefix= + +# Deploy OpenShift Web Console +web_console_install=false + +# OpenShift SDN (default value redhat/openshift-ovs-subnet) +openshift_sdn=redhat/openshift-ovs-subnet + +# persistent container storage: none, crs, cns +container_storage=none + +# Disk sizes in Gb of the persistent container storage per CNS/CRS node. +# Examples: +# 'container_storage_disks=100' means we create 1 disk (sdd) of 100 Gb. +# 'container_storage_disks=100,600,200' means we create 3 disks where +# first disk (sdd) is of 100 Gb in size, second (sde) is of 600 Gb and +# third (sdf) is of 200Gb. +container_storage_disks=100,600 + +# Following is used for deployment of block hosting volume for CNS when +# Block storage is enabled. +container_storage_block_hosting_volume_size=99 + +# Use 'additional_disks_to_storage_nodes' option to specify storage devices +# that should be attached to the storage nodes, but not used. +additional_disks_to_storage_nodes=100 + +# persistent container storage disk type. Can be one of following: +# 'thin', 'thick', 'zeroedThick', 'eagerZeroedThick', ... or any other +# type supported by VMWare. +container_storage_disk_type=thin + +# Seconds to wait for container storage pods to become ready. +container_storage_glusterfs_timeout=600 + +# String to use as secret key for performing heketi commands as admin +# If not set then it will be autogenerated. +heketi_admin_key=admin + +# String to use as secret key for performing heketi commands as user +# If not set then it will be autogenerated. +heketi_user_key=user + +# 'cns_automation_config_file_path' config option refers to the config file of +# the 'glusterfs-containers-tests' repo, which stores automated tests. +# If set, then all the deployment-specific data will be defined there. +# If not set, then no actions will be performed. +# If it is set and playbooks are run not using 'tox' then make sure 'yedit' +# module for ansible is enabled. It can be found using either of following links: +# - https://github.com/kwoodson/yedit (Author) +# - https://github.com/vponomaryov/yedit (forked) +cns_automation_config_file_path=./cns-automation-config.yaml -- cgit