Deprecate containerized_undercloud var, add use_heat instead.

cjeanner · Oct 1, 2018 · 1f4cee0 · 1f4cee0
1 parent 99b1087
commit 1f4cee0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -91,9 +91,13 @@ undercloud_config:
   - file (string)
   - content (string)
 
-*containerized_undercloud*
+*containerized_undercloud* **DEPRECATED**
   Boolean
 
+*use_heat*
+  Whether to add `--use-heat` to undercloud install command (Boolean).
+  Defaults "no"
+
 *ci_tools*
   Install CI tools (Boolean)
 

diff --git a/roles/undercloud/tasks/deploy.yaml b/roles/undercloud/tasks/deploy.yaml
@@ -2,15 +2,15 @@
   become: yes
   become_user: stack
   block:
-    - name: deploy containerized undercloud
-      when: containerized_undercloud|bool
+    - name: "deploy undercloud (explicit --use-heat)"
+      when: use_heat|bool
       command: openstack undercloud install --use-heat
       args:
         creates: /home/stack/stackrc
         chdir: /home/stack
 
-    - name: deploy baremetal undercloud
-      when: not containerized_undercloud|bool
+    - name: deploy undercloud
+      when: not use_heat|bool
       command: openstack undercloud install
       args:
         creates: /home/stack/stackrc

diff --git a/roles/undercloud/vars/main.yaml b/roles/undercloud/vars/main.yaml
@@ -5,8 +5,7 @@ overcloud_images:
     content: ironic-python-agent.kernel
   - file: overcloud-full.tar
     content: overcloud-full.qcow2
-
-containerized_undercloud: yes
+use_heat: no
 ci_tools: yes
 deploy_undercloud: yes
 deploy_overcloud: no