Merge "Don't append DockerInsecureRegistryAddress"
This commit is contained in:
commit
d1cd3cd9e4
|
@ -92,9 +92,6 @@ openstack overcloud container image prepare \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--tag $BUILD_ID
|
--tag $BUILD_ID
|
||||||
|
|
||||||
echo " DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
|
|
||||||
{{ working_dir }}/containers-default-parameters.yaml
|
|
||||||
|
|
||||||
echo "============================="
|
echo "============================="
|
||||||
echo "Containers default parameters:"
|
echo "Containers default parameters:"
|
||||||
cat {{ working_dir }}/containers-default-parameters.yaml
|
cat {{ working_dir }}/containers-default-parameters.yaml
|
||||||
|
|
|
@ -37,8 +37,6 @@ openstack overcloud container image prepare \
|
||||||
|
|
||||||
openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_upgrade_containers.yaml
|
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 %}
|
{% endif %}
|
||||||
|
|
||||||
{% if target_upgrade_version in ['pike', 'master'] %}
|
{% if target_upgrade_version in ['pike', 'master'] %}
|
||||||
|
|
|
@ -73,8 +73,6 @@ your hacking setup. By defaults it updates nothing, which is backwards compatibl
|
||||||
containerized undercloud services.
|
containerized undercloud services.
|
||||||
- `undercloud_docker_registry_port`: <'8787'> -- the container images registry port for the
|
- `undercloud_docker_registry_port`: <'8787'> -- the container images registry port for the
|
||||||
custom `undercloud_docker_registry_host`, if defined.
|
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
|
- `undercloud_docker_registry_namespace`: <`docker_registry_namespace`> -- the
|
||||||
container images namespace to be used with the custom `undercloud_docker_registry_host`,
|
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
|
if defined. Defaults to the overcloud `docker_registry_namespace` variable, which in
|
||||||
|
|
|
@ -10,7 +10,6 @@ network_environment_file: network-environment.yaml.j2
|
||||||
containerized_undercloud: false
|
containerized_undercloud: false
|
||||||
undercloud_docker_registry_namespace: "{{ docker_registry_namespace|default('tripleoupstream') }}"
|
undercloud_docker_registry_namespace: "{{ docker_registry_namespace|default('tripleoupstream') }}"
|
||||||
undercloud_docker_registry_port: 8787
|
undercloud_docker_registry_port: 8787
|
||||||
undercloud_docker_registry_insecure: true
|
|
||||||
undercloud_install_script: undercloud-install.sh.j2
|
undercloud_install_script: undercloud-install.sh.j2
|
||||||
|
|
||||||
# defines a custom undercloud roles file should be used with
|
# defines a custom undercloud roles file should be used with
|
||||||
|
|
|
@ -86,10 +86,6 @@ openstack overcloud container image prepare \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-r {{undercloud_roles_data}} \
|
-r {{undercloud_roles_data}} \
|
||||||
--namespace {{ undercloud_docker_registry_host }}:{{ undercloud_docker_registry_port }}/{{ undercloud_docker_registry_namespace }}
|
--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 %}
|
{% else %}
|
||||||
openstack overcloud container image prepare \
|
openstack overcloud container image prepare \
|
||||||
{% if containerized_undercloud|bool %}
|
{% if containerized_undercloud|bool %}
|
||||||
|
|
Loading…
Reference in New Issue