Merge "Add custom env and container cli option to standalone upgrade."

roles/standalone-upgrade/README.md

@@ -30,6 +30,8 @@ Role Variables
 
 - standalone_selinux_mode: <'permissive'> -- The selinux mode to use.
 
+- standalone_custom_env_files: <'[]'> -- list of additional environment files to be added to the deployment command (do not include the -e)
+
 Dependencies
 ------------
 

roles/standalone-upgrade/defaults/main.yml

@@ -17,6 +17,10 @@ standalone_upgrade_log: standalone_upgrade.log
 # deployment role
 standalone_role: Standalone.yaml
 
+standalone_selinux_mode: permissive
+
 standalone_libvirt_type: kvm
 
-standalone_selinux_mode: permissive
+standalone_container_cli: docker
+
+standalone_custom_env_files: []

roles/standalone-upgrade/templates/standalone.sh.j2

@@ -5,5 +5,8 @@ sudo openstack tripleo upgrade \
   -r {{ overcloud_templates_path }}/roles/{{ standalone_role }} \
   -e "{{ working_dir }}/containers-prepare-parameters-upgrade.yaml" \
   -e "{{ working_dir }}/standalone_parameters_upgrade.yaml" \
+{% if standalone_custom_env_files %}
+  -e {{ standalone_custom_env_files | join(' -e ') }} \
+{% endif %}
   --output-dir {{ working_dir }} \
   --standalone

roles/standalone-upgrade/templates/standalone_config.yaml.j2

@@ -1,6 +1,7 @@
 parameter_defaults:
   CertmongerCA: local
   CloudName: {{ standalone_ip }}
+  ContainerCli: {{ standalone_container_cli }}
   ControlPlaneStaticRoutes: []
   Debug: true
   DeploymentUser: {{ undercloud_user }}