containerized/undercloud: don't prepare containers by default
By default, we don't need to prepare the containers anymore, since they are now prepared in tripleoclient since: I00f72b1cd7ab6a03dd42bc489f3c950ee32dedeb We also introduce update_containers boolean that will be use in the near future, so we will prepare containers, update them and use them to deploy the undercloud and overcloud. This will be pushed later though. Change-Id: I5b76f80cfa4066845c0ec4c9e765d57d9ec2bfc9
This commit is contained in:
@@ -97,6 +97,7 @@ http://docs.openstack.org/developer/tripleo-quickstart/accessing-libvirt.html
|
||||
downloaded ansible configs and processed heat templates for heat installer
|
||||
- `undercloud_undercloud_cleanup`: <null> -- controls tear down of the processed heat templates
|
||||
in the output directory for heat installer
|
||||
- update_containers: <false> -- whether to update containers from the local registry.
|
||||
|
||||
Role Network Variables
|
||||
----------------------
|
||||
|
||||
@@ -95,3 +95,5 @@ undercloud_network_environment_args:
|
||||
ControlPlaneSubnetCidr: 24
|
||||
|
||||
ctlplane_masquerade: false
|
||||
|
||||
update_containers: false
|
||||
|
||||
@@ -79,4 +79,4 @@
|
||||
src: undercloud-prep-containers.sh.j2
|
||||
dest: "{{ working_dir }}/undercloud-prep-containers.sh"
|
||||
mode: 0755
|
||||
when: containerized_undercloud|bool
|
||||
when: containerized_undercloud|bool and update_containers|bool
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
- include: undercloud-prep-containers.yml
|
||||
tags:
|
||||
- undercloud-scripts
|
||||
when: containerized_undercloud|bool
|
||||
when: containerized_undercloud|bool and update_containers|bool
|
||||
|
||||
- include: install-undercloud.yml
|
||||
tags:
|
||||
|
||||
@@ -245,7 +245,7 @@ docker_registry_mirror = {{undercloud_docker_registry_mirror}}
|
||||
|
||||
# additional env files for undercloud, used with containers
|
||||
|
||||
{% if undercloud_container_images_file is defined %}
|
||||
{% if undercloud_container_images_file is defined and update_containers|bool %}
|
||||
container_images_file = {{ undercloud_container_images_file }}
|
||||
{% else %}
|
||||
#container_images_file = <None>
|
||||
|
||||
Reference in New Issue
Block a user