Do not assume default values for undercloud.conf

Stop making assumption about the default values from undercloud.conf.
These can change and break quickstart. This also means the generated
undercloud.conf has broken documentation the day a default value
changes, making it harder to debug failures.

Be more specific and set defaults values for boolean variables.

Change-Id: I9c530e2234e627e9795347d2e5208e8dc965bb45

roles/undercloud-deploy/README.md

@@ -37,18 +37,21 @@ http://docs.openstack.org/developer/tripleo-quickstart/accessing-libvirt.html
 - `undercloud_extra_args`: <''> -- extra options for undercloud deploy command.
 - `undercloud_update_packages`: <'null'> -- a string with a list of packages to update as dependencies for
 your hacking setup. By defaults it updates nothing, which is backwards compatible.
-- `undercloud_enable_ui`: Sets up the 'enable_ui' option in undercloud.conf.
-  It's undefined by default, however, the default value for this option in the
-  undercloud is true.
-- `undercloud_enable_telemetry`: Sets up the 'enable_telemetry' option in
-  undercloud.conf.  It's undefined by default, however, the default value for
-  this option in the undercloud is true.
-- `undercloud_enable_validations`: Sets up the 'enable_validations' option in
-  undercloud.conf.  It's undefined by default, however, the default value for
-  this option in the undercloud is true.
-- `undercloud_enable_novajoin`: Sets up the 'enable_novajoin' value from
-  undercloud.conf. Note that using 'enable_tls_everywhere' will have the same
-  effect. Defaults to false.
+- `undercloud_enable_mistral`: <'false'> -- sets up the 'enable_mistral' option
+  in undercloud.conf.
+- `undercloud_enable_monitoring`: <'false'> -- sets up the 'enable_monitoring'
+  option in undercloud.conf.
+- `undercloud_enable_telemetry`: <'true'> -- sets up the 'enable_telemetry'
+  option in undercloud.conf.
+- `undercloud_enable_tempest`: <'true'> -- sets up the 'enable_tempest' option
+  in undercloud.conf.
+- `undercloud_enable_ui`: <'true'> -- sets up the 'enable_ui' option in
+  undercloud.conf.
+- `undercloud_enable_validations`: <'true'> -- sets up the 'enable_validations'
+  option in undercloud.conf.
+- `undercloud_enable_novajoin`: <'false'> -- sets up the 'enable_novajoin'
+  value from undercloud.conf. Note that using 'enable_tls_everywhere' will have
+  the same effect.
 - `novajoin_connect_timeout`: <5> Sets vendordata_dynamic_connect_timeout when novajoin is enabled
 - `novajoin_read_timeout:` <20> Sets vendordata_dynamic_read_timeout when novajoin is enabled
 - `prepare_novajoin`: If set to true, it will install novajoin in the undercloud,

roles/undercloud-deploy/defaults/main.yml

@@ -63,3 +63,13 @@ libvirt_default_network_address: 192.168.122.1
 # only to be used in libvirt deployments, see environment config for details
 nameserver_from_virthost: false
 virthost_nameservers: []
+
+undercloud_enable_mistral: false
+undercloud_enable_monitoring: false
+undercloud_enable_telemetry: true
+undercloud_enable_tempest: true
+undercloud_enable_ui: true
+undercloud_enable_validations: true
+undercloud_ipxe_deploy: true
+
+undercloud_undercloud_debug: true

roles/undercloud-deploy/tasks/main.yml

@@ -43,11 +43,8 @@
   tags:
     - undercloud-post-install
 
-# undercloud_enable_ui is not set by default so that the undercloud.conf default
-# value can be used instead of one within quickstart. Currently its default
-# is true, so the behavior is mimicked here
 - include: tripleo-ui.yml
   tags:
     - undercloud-post-install
-  when: (enable_vbmc|bool and (undercloud_enable_ui is not defined or undercloud_enable_ui|bool)) or enable_libvirt_tripleo_ui|bool
+  when: (enable_vbmc|bool and undercloud_enable_ui|bool) or enable_libvirt_tripleo_ui|bool
 

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

@@ -178,70 +178,37 @@ inspection_runbench = {{undercloud_inspection_runbench}}
 
 # Whether to enable the debug log level for Undercloud OpenStack
 # services. (boolean value)
-{% if undercloud_undercloud_debug is defined %}
 undercloud_debug = {{undercloud_undercloud_debug}}
-{% else %}
-#undercloud_debug = true
-{% endif %}
 
 # Whether to install Tempest in the Undercloud. (boolean value)
-{% if undercloud_enable_tempest is defined %}
 enable_tempest = {{undercloud_enable_tempest}}
-{% else %}
-#enable_tempest = true
-{% endif %}
 
 # Whether to install Telemetry services (ceilometer, aodh) in the
 # Undercloud. (boolean value)
-{% if undercloud_enable_telemetry is defined %}
 enable_telemetry = {{undercloud_enable_telemetry}}
-{% else %}
-#enable_telemetry = true
-{% endif %}
-
 
 # Whether to install requirements to run the TripleO validations.
 # (boolean value)
-{% if undercloud_enable_validations is defined %}
 enable_validations = {{undercloud_enable_validations}}
-{% else %}
-#enable_validations = true
-{% endif %}
 
 # Whether to install the TripleO UI. (boolean value)
-{% if undercloud_enable_ui is defined %}
 enable_ui = {{undercloud_enable_ui}}
-{% else %}
-#enable_ui = true
-{% endif %}
 
 # Whether to install Mistral in the Undercloud. (boolean value)
-{% if undercloud_enable_mistral is defined %}
 enable_mistral = {{undercloud_enable_mistral}}
-{% else %}
-#enable_mistral = false
-{% endif %}
 
 # Whether to use iPXE for deploy by default. (boolean value)
-{% if undercloud_ipxe_deploy is defined %}
 ipxe_deploy = {{undercloud_ipxe_deploy}}
-{% else %}
-#ipxe_deploy = true
-{% endif %}
 
 # Whether to install Monitoring services in the Undercloud. (boolean
 # value)
-{% if undercloud_enable_monitoring is defined %}
 enable_monitoring = {{undercloud_enable_monitoring}}
-{% else %}
-#enable_monitoring = false
-{% endif %}
 
 # Whether to install novajoin metadata service in the Undercloud.
 {% if undercloud_enable_novajoin or enable_tls_everywhere %}
 enable_novajoin = true
 {% else %}
-#enable_novajoin = false
+enable_novajoin = false
 {% endif %}
 
 # One Time Password to register Undercloud node with IPA server.