diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-06-12 13:43:46 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-06-12 13:43:46 -0700 |
| commit | ccf7dfedb636c2fc7392f1c2ec1f1d06f0d0c5b5 (patch) | |
| tree | 6f2aa57ffdfceee3e7170d0648fce9979c6a2f91 | |
| parent | 17c6b4c5da76ecff6f8c68254ab6424d0d9a736e (diff) | |
| download | openshift-ccf7dfedb636c2fc7392f1c2ec1f1d06f0d0c5b5.tar.gz openshift-ccf7dfedb636c2fc7392f1c2ec1f1d06f0d0c5b5.tar.bz2 openshift-ccf7dfedb636c2fc7392f1c2ec1f1d06f0d0c5b5.tar.xz openshift-ccf7dfedb636c2fc7392f1c2ec1f1d06f0d0c5b5.zip | |
* Make portal_net configurable when wetting up the nodes OpenShift Registry
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index e4d3bf26f..cb67a13de 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -705,7 +705,7 @@ class OpenShiftFacts(object): defaults['master'] = master if 'node' in roles: - node = dict(pod_cidr='', labels={}, annotations={}) + node = dict(pod_cidr='', labels={}, annotations={}, portal_net='172.30.0.0/16') node['resources_cpu'] = self.system_facts['processor_cores'] node['resources_memory'] = int( int(self.system_facts['memtotal_mb']) * 1024 * 1024 * 0.75 diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 7dd76e0b8..15d18f510 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -20,6 +20,7 @@ annotations: "{{ openshift_node_annotations | default(none) }}" registry_url: "{{ oreg_url | default(none) }}" debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}" + portal_net: "{{ openshift_master_portal_net | default(None) }}" - name: Install OpenShift Node package yum: pkg=openshift-node state=present @@ -64,7 +65,7 @@ lineinfile: dest: /etc/sysconfig/docker regexp: '^OPTIONS=.*' - line: "OPTIONS='--insecure-registry=172.30.0.0/16 --selinux-enabled'" + line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} --selinux-enabled'" when: docker_check.stat.isreg - name: Allow NFS access for VMs |