openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Switch tripleo_deploy_standalone to false by default 

In the victoria cycle, this option become deprecated and no longer needs
to be provided. In older version a user will need to set it to true if
they wish to use the `openstack tripleo deploy` command.

Depends-On: https://review.opendev.org/#/c/753852/
Change-Id: I5e3e166f02b8825e23320d910e03bc7fddb519b0
This commit is contained in:
Alex Schultz 2020-09-23 14:55:40 -06:00
parent c1527ca9fc
commit 1dc9129518
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/standalone.yml
View File

@ -108,5 +108,4 @@
- /usr/share/openstack-tripleo-heat-templates/environments/standalone/standalone-tripleo.yaml
- "{{ ansible_env.HOME }}/container-image-prepare.yaml"
- "{{ ansible_env.HOME }}/parameters.yaml"
tripleo_deploy_standalone: true
tripleo_deploy_output_dir: "{{ ansible_env.HOME }}"

2
roles/tripleo_deploy/README.md
View File

@ -43,7 +43,7 @@ Role Variables
* `tripleo_deploy_public_virtual_ip`: (String) Public network VIP.
* `tripleo_deploy_roles_file`: (String) File path to a deployment roles file.
* `tripleo_deploy_stack`: (String) Name for ephemeral stack. Default: standalone
* `tripleo_deploy_standalone`: (Boolean) Flag to indicate that a standalone cloud is being deployed. Default: true
* `tripleo_deploy_standalone`: (Boolean) Flag to indicate that a standalone cloud is being deployed. Should be false after the Victoria. Default: false
* `tripleo_deploy_standalone_role`: (String) Role name to deploy. Default: Standalone
* `tripleo_deploy_templates`: (String) Path to the directory containing heat templates for the deployment. Default: /usr/share/openstack-tripleo-heat-templates
* `tripleo_deploy_timeout`: (Integer) Number in seconds to wait for the ansible execution of the deployment command to finish. This should be larger than the `tripleo_deploy_timeout_arg` value. Default: 5700

2
roles/tripleo_deploy/defaults/main.yml
View File

@ -34,7 +34,7 @@ tripleo_deploy_poll: 10
tripleo_deploy_public_virtual_ip:
tripleo_deploy_roles_file: "{{ tripleo_deploy_templates }}/roles/Standalone.yaml"
tripleo_deploy_stack: standalone
tripleo_deploy_standalone: true
tripleo_deploy_standalone: false
tripleo_deploy_standalone_role: Standalone
tripleo_deploy_templates: /usr/share/openstack-tripleo-heat-templates
tripleo_deploy_timeout: 5700

6
roles/tripleo_deploy/molecule/default/converge.yml
View File

@ -25,7 +25,7 @@
that:
- tripleo_deploy_output ==
"tripleo deploy --templates /usr/share/openstack-tripleo-heat-templates "
"--standalone --stack standalone --standalone-role Standalone --timeout 90 "
"--stack standalone --standalone-role Standalone --timeout 90 "
"--local-ip 192.168.24.2/24"
- name: Check parameter "tripleo_deploy_stack"
@ -34,14 +34,14 @@
vars:
tripleo_deploy_templates:
tripleo_deploy_stack: test
tripleo_deploy_standalone: false
tripleo_deploy_standalone: true
tripleo_deploy_standalone_role:
tripleo_deploy_timeout_arg:
- name: Assert "tripleo_deploy_stack"
assert:
that:
- tripleo_deploy_output == "tripleo deploy --stack test --local-ip 192.168.24.2/24"
- tripleo_deploy_output == "tripleo deploy --standalone --stack test --local-ip 192.168.24.2/24"
- name: Check parameter "tripleo_deploy_upgrade"
include_role: