Skip to content

Commit

Permalink
Remove needless variable re-declaration
Browse files Browse the repository at this point in the history
Those variables are already defined in our group_vars, let's re-use
them.

Change-Id: I94065c1442dc061ff621e5ce0d861bbcc2e269c8
  • Loading branch information
David Moreau-Simard committed Nov 3, 2017
1 parent c9daecf commit bfd7084
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
8 changes: 0 additions & 8 deletions roles/host-preparation/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
# under the License.
#

host_preparation_domain: registry.rdoproject.org
host_preparation_registry: trunk.registry.rdoproject.org
host_preparation_console: console.registry.rdoproject.org

host_preparation_packages:
- wget
- git
Expand All @@ -29,10 +25,6 @@ host_preparation_packages:
- docker
- pyOpenSSL

# OpenStack (TripleO) clouds have a default MTU of 1450, we need to override
# the 1500 default
host_preparation_docker_mtu: 1400

# It is expected that the host has an additional cinder volume/disk for the
# storage of containers and images.
# host_preparation_docker_disk: "/dev/vdb"
10 changes: 5 additions & 5 deletions roles/host-preparation/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
line: "127.0.0.1 {{ item }}"
insertafter: EOF
with_items:
- "{{ host_preparation_domain }}"
- "{{ host_preparation_registry }}"
- "{{ host_preparation_console }}"
- "{{ openshift_master_cluster_public_hostname }}"
- "{{ openshift_hosted_registry_routehost }}"
- "{{ openshift_hosted_registry_console_routehost }}"
- "{{ ansible_fqdn }}"

- name: Configure Docker insecure registry for internal OpenShift subnet
lineinfile:
dest: "/etc/sysconfig/docker"
regexp: "^INSECURE_REGISTRY="
line: "INSECURE_REGISTRY='--insecure-registry 172.30.0.0/16'"
line: "INSECURE_REGISTRY='--insecure-registry {{ openshift_docker_insecure_registries }}'"
notify:
- Restart docker

Expand All @@ -50,7 +50,7 @@
lineinfile:
dest: "/etc/sysconfig/docker-network"
regexp: "^DOCKER_NETWORK_OPTIONS="
line: "DOCKER_NETWORK_OPTIONS='--mtu {{ host_preparation_docker_mtu }}'"
line: "DOCKER_NETWORK_OPTIONS='--mtu {{ openshift_node_sdn_mtu }}'"
notify:
- Restart docker

Expand Down

0 comments on commit bfd7084

Please sign in to comment.