From 57cf103922372c68ce319bbfff67dbefebe4bfbc Mon Sep 17 00:00:00 2001 From: Luke Short Date: Thu, 7 Nov 2019 11:49:49 -0500 Subject: [PATCH] Use python instead of python3 for the undercloud.conf.sample path. Resolves #373 For backwards compatiblity, TripleO no longer uses the python3 path. Signed-off-by: Luke Short --- plugins/tripleo-undercloud/configure.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/tripleo-undercloud/configure.yml b/plugins/tripleo-undercloud/configure.yml index f0a8fd9c19..8d8ee84acf 100644 --- a/plugins/tripleo-undercloud/configure.yml +++ b/plugins/tripleo-undercloud/configure.yml @@ -8,8 +8,6 @@ - osp_release: "{{ install.version|openstack_release }}" - conf_instack: '/usr/share/instack-undercloud/undercloud.conf.sample' - conf_oooclient: '/usr/share/python-tripleoclient/undercloud.conf.sample' - - conf_oooclient_py3: '/usr/share/python3-tripleoclient/undercloud.conf.sample' - - default_conf: "{{ (osp_release <= 13) | ternary(conf_instack, (osp_release < 15) | ternary(conf_oooclient, conf_oooclient_py3)) }}" - local_src: "{%- if conf.file|default('') -%} {{ conf.file }} {%- elif 'hypervisor' in groups.all or 'undercloud_hypervisors' in groups or 'bmc' in groups -%} @@ -79,7 +77,7 @@ - name: copy default undercloud config copy: remote_src: yes - src: "{{ default_conf }}" + src: "{{ conf_oooclient }}" dest: ~/undercloud.conf force: yes mode: 0755