diff options
author | Tomas Sedovic <tomas@sedovic.cz> | 2017-10-18 14:00:50 +0200 |
---|---|---|
committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-10-18 14:00:50 +0200 |
commit | 9f69f214958e1c33bf1c082cd7243dca4e8eebb8 (patch) | |
tree | 8f3f9b8a89729ade9c482b39a8f630636a341b7c /playbooks/provisioning/openstack/sample-inventory/group_vars | |
parent | 255bda6812c53d39723d0ad2b27698e2d627f3bd (diff) | |
parent | 3823c72af11f77b9639176921b398fbab2ac04fd (diff) | |
download | openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.gz openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.bz2 openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.xz openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.zip |
Merge branch 'master' into openstack-docs
Diffstat (limited to 'playbooks/provisioning/openstack/sample-inventory/group_vars')
-rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml | 6 | ||||
-rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml index 970a07815..4c1ca8c96 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml @@ -51,3 +51,9 @@ openshift_override_hostname_check: true # NOTE(shadower): Always switch to root on the OSEv3 nodes. # openshift-ansible requires an explicit `become`. ansible_become: true + +# # Flannel networking +#osm_cluster_network_cidr: 10.128.0.0/14 +#openshift_use_openshift_sdn: false +#openshift_use_flannel: true +#flannel_interface: eth1 diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml index fa1fb6c64..83289307d 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml @@ -15,6 +15,10 @@ public_dns_nameservers: [] openstack_ssh_public_key: "openshift" openstack_external_network_name: "public" #openstack_private_network_name: "openshift-ansible-{{ stack_name }}-net" +# # A dedicated Neutron network name for containers data network +# # Configures the data network to be separated from openstack_private_network_name +# # NOTE: this is only supported with Flannel SDN yet +#openstack_private_data_network_name: "openshift-ansible-{{ stack_name }}-data-net" ## If you want to use a provider network, set its name here. ## NOTE: the `openstack_external_network_name` and |