Merge "Don't append DockerInsecureRegistryAddress"

roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2

@@ -92,9 +92,6 @@ openstack overcloud container image prepare \
 {% endif %}
     --tag $BUILD_ID
 
-echo "  DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
-    {{ working_dir }}/containers-default-parameters.yaml
-
 echo "============================="
 echo "Containers default parameters:"
 cat {{ working_dir }}/containers-default-parameters.yaml

roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2

@@ -37,8 +37,6 @@ openstack overcloud container image prepare \
 
 openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_upgrade_containers.yaml
 
-echo "  DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
-    ~/containers-default-parameters.yaml
 {% endif %}
 
 {% if target_upgrade_version in ['pike', 'master'] %}

roles/undercloud-deploy/README.md

@@ -73,8 +73,6 @@ your hacking setup. By defaults it updates nothing, which is backwards compatibl
   containerized undercloud services.
 - `undercloud_docker_registry_port`: <'8787'> -- the container images registry port for the
   custom `undercloud_docker_registry_host`, if defined.
-- `undercloud_docker_registry_insecure`: <'true'> -- defines either the custom
-  `undercloud_docker_registry_host` points to an unsecure or secure registry.
 - `undercloud_docker_registry_namespace`: <`docker_registry_namespace`> -- the
   container images namespace to be used with the custom `undercloud_docker_registry_host`,
   if defined. Defaults to the overcloud `docker_registry_namespace` variable, which in

roles/undercloud-deploy/defaults/main.yml

@@ -10,7 +10,6 @@ network_environment_file: network-environment.yaml.j2
 containerized_undercloud: false
 undercloud_docker_registry_namespace: "{{ docker_registry_namespace|default('tripleoupstream') }}"
 undercloud_docker_registry_port: 8787
-undercloud_docker_registry_insecure: true
 undercloud_install_script: undercloud-install.sh.j2
 
 # defines a custom undercloud roles file should be used with

roles/undercloud-deploy/templates/undercloud-deploy.sh.j2

@@ -86,10 +86,6 @@ openstack overcloud container image prepare \
 {% endif %}
     -r {{undercloud_roles_data}} \
     --namespace {{ undercloud_docker_registry_host }}:{{ undercloud_docker_registry_port }}/{{ undercloud_docker_registry_namespace }}
-{% if undercloud_docker_registry_insecure|bool %}
-echo "  DockerInsecureRegistryAddress: {{ undercloud_docker_registry_host }}:{{ undercloud_docker_registry_port }}" >> \
-    {{ working_dir }}/undercloud-containers-default-parameters.yaml
-{% endif %}
 {% else %}
 openstack overcloud container image prepare \
 {% if containerized_undercloud|bool %}