diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
commit | 00eb0c79ed65543b3d358ae71b1a40fcbc88d78b (patch) | |
tree | b791494908cd7341c420cc9c59dc6a2dd82db4a8 /playbooks/openstack | |
parent | 096cf64128ebcb1249044a1cb28b1b06154766ae (diff) | |
parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
download | openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.gz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.bz2 openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.xz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.zip |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/openstack')
-rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 | ||||
-rw-r--r-- | playbooks/openstack/openshift-cluster/launch.yml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml index 1d54a9c39..422e6dafe 100644 --- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml +++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml @@ -288,6 +288,14 @@ resources: port_range_max: 53 - direction: ingress protocol: tcp + port_range_min: 8053 + port_range_max: 8053 + - direction: ingress + protocol: udp + port_range_min: 8053 + port_range_max: 8053 + - direction: ingress + protocol: tcp port_range_min: 24224 port_range_max: 24224 - direction: ingress diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml index 6429a6755..b9aae2f4c 100644 --- a/playbooks/openstack/openshift-cluster/launch.yml +++ b/playbooks/openstack/openshift-cluster/launch.yml @@ -46,7 +46,7 @@ -P master_flavor={{ openstack_flavor["master"] }} -P node_flavor={{ openstack_flavor["node"] }} -P infra_flavor={{ openstack_flavor["infra"] }} - -P dns_flavor={{ openshift_flavor["dns"] }} + -P dns_flavor={{ openstack_flavor["dns"] }} openshift-ansible-{{ cluster_id }}-stack' - name: Wait for OpenStack Stack readiness |