gistfile1.txt

root@rpco-liberty:~# cp /etc/openstack_deploy/user_variables.yml /etc/openstack_deploy/user_variables.yml.orig
root@rpco-liberty:~# # Remove horizon static files variables from user_variables.yml as this is now
root@rpco-liberty:~# # maintained in group_vars.
root@rpco-liberty:~# if grep '^rackspace_static_files_folder\:' /etc/openstack_deploy/user_variables.yml; then
>   sed -i '/^rackspace_static_files_folder:.*/d' /etc/openstack_deploy/user_variables.yml
> fi
rackspace_static_files_folder: /opt/rpc-openstack/rpcd/playbooks/roles/horizon_extensions/files
root@rpco-liberty:~#
root@rpco-liberty:~# # Remove horizon_custom_uploads block from user_variables.yml as this is maintained in
root@rpco-liberty:~# # group_vars
root@rpco-liberty:~# if grep '^horizon_custom_uploads\:' /etc/openstack_deploy/user_variables.yml; then
>   sed -i '/horizon_custom_uploads:/,/src:.*logo-splash.png/d' /etc/openstack_deploy/user_variables.yml
> fi
horizon_custom_uploads:
root@rpco-liberty:~# diff -u /etc/openstack_deploy/user_variables.yml.orig /etc/openstack_deploy/user_variables.yml
--- /etc/openstack_deploy/user_variables.yml.orig       2017-10-06 18:02:00.377749583 +0000
+++ /etc/openstack_deploy/user_variables.yml    2017-10-06 18:02:24.861647160 +0000
@@ -36,16 +36,6 @@
 heat_api_workers: 2
 heat_ceilometer_enabled: false
 heat_engine_workers: 2
-horizon_custom_uploads:
-  favicon:
-    dest: img/favicon.ico
-    src: '{{ rackspace_static_files_folder }}/favicon.ico'
-  logo:
-    dest: img/logo.png
-    src: '{{ rackspace_static_files_folder }}/logo.png'
-  logo-splash:
-    dest: img/logo-splash.png
-    src: '{{ rackspace_static_files_folder }}/logo-splash.png'
 horizon_venv_tag: '{{ openstack_release }}'
 horizon_wsgi_processes: 2
 horizon_wsgi_threads: 2
@@ -157,7 +147,6 @@
 - /etc/openstack_deploy
 - /opt/rpc-openstack/rpcd
 rabbitmq_ulimit: 65535
-rackspace_static_files_folder: /opt/rpc-openstack/rpcd/playbooks/roles/horizon_extensions/files
 repo_build_upper_constraints_overrides:
 - elasticsearch<2.1.0
 rpc_conn_pool_size: 180