summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-06-16 17:16:06 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-06-16 17:16:06 +0200
commitca93151d4dee1f907cf578e3ab2b565f288c37c8 (patch)
treec72cd4af96553902612ac84cf75b23cc1b189203
parentc12c972e8c1180cebf24ddd0eb43b26657fdaec6 (diff)
downloadopenshift-ca93151d4dee1f907cf578e3ab2b565f288c37c8.tar.gz
openshift-ca93151d4dee1f907cf578e3ab2b565f288c37c8.tar.bz2
openshift-ca93151d4dee1f907cf578e3ab2b565f288c37c8.tar.xz
openshift-ca93151d4dee1f907cf578e3ab2b565f288c37c8.zip
Update sample inventory with the latest changes
-rw-r--r--playbooks/provisioning/openstack/README.md3
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml42
3 files changed, 31 insertions, 16 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index c319791c9..423d57113 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -9,6 +9,7 @@ etc.). The result is an environment ready for openshift-ansible.
* [Ansible 2.3](https://pypi.python.org/pypi/ansible)
* [shade](https://pypi.python.org/pypi/shade)
+* python-dns
## What does it do
@@ -66,7 +67,7 @@ The `openstack_num_masters`, `openstack_num_infra` and
`openstack_num_nodes` values specify the number of Master, Infra and
App nodes to create.
-The `openstack_flat_secgroup`, controls Neutron security groups creation for Heat
+The `openstack_flat_secgrp`, controls Neutron security groups creation for Heat
stacks. Set it to true, if you experience issues with sec group rules
quotas. It trades security for number of rules, by sharing the same set
of firewall rules for master, node, etcd and infra nodes.
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
index d850f88a4..32ec43387 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -1,7 +1,7 @@
---
openshift_deployment_type: openshift-enterprise
openshift_release: v3.5
-openshift_master_default_subdomain: "apps.openshift.example.com"
+openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
# NOTE(shadower): do not remove this line, otherwise the default node labels
# won't be set up.
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index 3eb0f9f80..31e0a61ed 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -1,6 +1,7 @@
env_id: "openshift"
-openstack_dns_domain: "example.com"
-openstack_nameservers: ["192.168.1.1"]
+public_dns_domain: "example.com"
+public_dns_nameservers: []
+
openstack_ssh_public_key: "openshift"
openstack_default_image_name: "rhel73"
openstack_default_flavor: "m1.medium"
@@ -12,26 +13,39 @@ openstack_num_nodes: 2
docker_volume_size: "15"
-# TODO(shadower): this is identical to `openstack_dns_domain`.
-# We should make it so it's not duplicated here.
-dns_domain: "example.com"
-
-# TODO(shadower): this is identical to `openstack_nameservers`.
-# We should make it so it's not duplicated here.
-public_dns_forwarder: "192.168.1.1"
-
openstack_subnet_prefix: "192.168.99"
# # Red Hat subscription
+# # Using Red Hat Satellite:
# rhsm_register: True
+# rhsm_satellite: 'sat-6.example.com'
+# rhsm_org: 'OPENSHIFT_ORG'
+# rhsm_activationkey: '<activation-key>'
+
+# # Or using RHN username, password and optionally pool:
+# rhsm_register: True
+# rhsm_username: '<username>'
+# rhsm_password: '<password>'
+# rhsm_pool: '<pool id>'
+
# rhsm_repos:
# - "rhel-7-server-rpms"
# - "rhel-7-server-ose-3.5-rpms"
# - "rhel-7-server-extras-rpms"
# - "rhel-7-fast-datapath-rpms"
-# rhsm_username: '<username>'
-# rhsm_password: '<password>'
-# rhsm_pool: '<pool id>'
+
+
+# # Roll-your-own DNS
+# openstack_num_dns: 0
+# external_nsupdate_keys:
+# public:
+# key_secret: 'SKqKNdpfk7llKxZ57bbxUnUDobaaJp9t8CjXLJPl+fRI5mPcSBuxTAyvJPa6Y9R7vUg9DwCy/6WTpgLNqnV4Hg=='
+# key_algorithm: 'hmac-md5'
+# server: '192.168.1.1'
+# private:
+# key_secret: 'kVE2bVTgZjrdJipxPhID8BEZmbHD8cExlVPR+zbFpW6la8kL5wpXiwOh8q5AAosXQI5t95UXwq3Inx8QT58duw=='
+# key_algorithm: 'hmac-md5'
+# server: '192.168.1.2'
# NOTE(shadower): Do not change this value. The Ansible user is currently
@@ -39,4 +53,4 @@ openstack_subnet_prefix: "192.168.99"
ansible_user: openshift
# Use a single security group for a cluster
-openstack_flat_secgroup: false
+openstack_flat_secgrp: false