From 9f5f3191ac63d3942e6ee37d08ca6790a318a8be Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 15 Dec 2015 17:48:45 +0000 Subject: [PATCH] Remove option of installing tuskar This isn't supported anymore and likely doesn't work, so let's just remove it. Change-Id: If31fe9e602323022eb99eddb786492462c09157e --- .../install.d/02-puppet-stack-config | 2 -- .../puppet-stack-config.pp | 20 ------------- .../puppet-stack-config.yaml.template | 9 ------ elements/tuskar-ui-extras/README.md | 1 - elements/tuskar-ui-extras/element-deps | 1 - .../package-installs-tuskar-ui-extras | 1 - .../post-configure.d/102-tuskar-ui-extras | 29 ------------------- .../environment.d/00-package-install | 5 +--- .../config.json.template | 9 ------ .../02-undercloud-stack-heat-metadata | 1 - .../root/tripleo-undercloud-passwords | 1 - .../configure.d/80-tuskar-db-create | 10 ------- instack_undercloud/undercloud.py | 8 ----- undercloud.conf.sample | 8 ----- 14 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 elements/tuskar-ui-extras/README.md delete mode 100644 elements/tuskar-ui-extras/element-deps delete mode 100644 elements/tuskar-ui-extras/install.d/package-installs-tuskar-ui-extras delete mode 100755 elements/tuskar-ui-extras/os-refresh-config/post-configure.d/102-tuskar-ui-extras delete mode 100755 elements/undercloud-stack-config/os-refresh-config/configure.d/80-tuskar-db-create diff --git a/elements/puppet-stack-config/install.d/02-puppet-stack-config b/elements/puppet-stack-config/install.d/02-puppet-stack-config index 721b8cd4b..7450d6f3c 100755 --- a/elements/puppet-stack-config/install.d/02-puppet-stack-config +++ b/elements/puppet-stack-config/install.d/02-puppet-stack-config @@ -53,11 +53,9 @@ context = { 'UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD': os.environ.get('UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD', 'unset'), 'UNDERCLOUD_NOVA_PASSWORD': os.environ.get('UNDERCLOUD_NOVA_PASSWORD', 'unset'), 'UNDERCLOUD_IRONIC_PASSWORD': os.environ.get('UNDERCLOUD_IRONIC_PASSWORD', 'unset'), - 'UNDERCLOUD_TUSKAR_PASSWORD': os.environ.get('UNDERCLOUD_TUSKAR_PASSWORD', 'unset'), 'UNDERCLOUD_DEBUG': os.environ.get('UNDERCLOUD_DEBUG', 'true'), 'INSPECTION_IPRANGE': os.environ.get('INSPECTION_IPRANGE', '192.0.2.100,192.0.2.120'), 'INSPECTION_INTERFACE': os.environ.get('INSPECTION_INTERFACE', 'br-ctlplane'), - 'ENABLE_TUSKAR': os.environ.get('ENABLE_TUSKAR', 'true'), 'ENABLE_TEMPEST': os.environ.get('ENABLE_TEMPEST', 'true'), 'ENABLE_MISTRAL': os.environ.get('ENABLE_MISTRAL', 'false'), 'IPXE_DEPLOY': os.environ.get('IPXE_DEPLOY', 'true'), diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 709c958b2..653afefea 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -120,7 +120,6 @@ include ::aodh::keystone::auth include ::swift::keystone::auth include ::ironic::keystone::auth include ::ironic::keystone::auth_inspector -include ::tuskar::keystone::auth # Because os-cloud-config/tree/os_cloud_config/keystone.py already managed # it but with a different service name than Puppet will do (novav3), we want Puppet @@ -381,25 +380,6 @@ if str2bool(hiera('ipxe_deploy', true)) { include ::ironic::inspector -if str2bool(hiera('enable_tuskar', true)) { - class { '::horizon': - secret_key => hiera('horizon_secret_key'), - keystone_url => join(['http://', hiera('controller_host'), ':5000/v2.0']), - allowed_hosts => [hiera('controller_host'), $::fqdn, 'localhost'], - server_aliases => [hiera('controller_host'), $::fqdn, 'localhost'], - tuskar_ui => true, - tuskar_ui_ironic_discoverd_url => join(['http://', hiera('controller_host'), ':5050']), - tuskar_ui_undercloud_admin_password => hiera('admin_password'), - } - - # Install python-tuskarclient so we can deploy a stack with tuskar - package{'python-tuskarclient': } - - class { '::tuskar::ui': - extras => true, - } -} - if hiera('service_certificate', undef) { class { '::tripleo::loadbalancer': controller_virtual_ip => hiera('controller_admin_vip'), diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 985dd7537..cb1dee2eb 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -316,14 +316,6 @@ ironic::inspector::dnsmasq_local_ip: {{LOCAL_IP}} ironic::inspector::dnsmasq_ip_range: {{INSPECTION_IPRANGE}} ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}} -# Tuskar -tuskar::keystone::auth::tenant: 'service' -tuskar::keystone::auth::public_url: http://{{LOCAL_IP}}:8585/v2 -tuskar::keystone::auth::internal_url: http://{{LOCAL_IP}}:8585/v2 -tuskar::keystone::auth::admin_url: http://{{LOCAL_IP}}:8585/v2 -tuskar::keystone::auth::password: {{UNDERCLOUD_TUSKAR_PASSWORD}} -tuskar::keystone::auth::region: "%{hiera('keystone_region')}" - # Rabbit rabbit_cookie: {{UNDERCLOUD_RABBIT_COOKIE}} rabbitmq::delete_guest_user: false @@ -374,7 +366,6 @@ swift::proxy::authtoken::admin_tenant_name: 'service' mistral::admin_tenant_name: 'service' # Options -enable_tuskar: {{ENABLE_TUSKAR}} enable_tempest: {{ENABLE_TEMPEST}} enable_mistral: {{ENABLE_MISTRAL}} ipxe_deploy: {{IPXE_DEPLOY}} diff --git a/elements/tuskar-ui-extras/README.md b/elements/tuskar-ui-extras/README.md deleted file mode 100644 index 0f10fe7b6..000000000 --- a/elements/tuskar-ui-extras/README.md +++ /dev/null @@ -1 +0,0 @@ -Element that provides additional plugins for the tuskar-ui. \ No newline at end of file diff --git a/elements/tuskar-ui-extras/element-deps b/elements/tuskar-ui-extras/element-deps deleted file mode 100644 index dbfb96122..000000000 --- a/elements/tuskar-ui-extras/element-deps +++ /dev/null @@ -1 +0,0 @@ -tuskar-ui diff --git a/elements/tuskar-ui-extras/install.d/package-installs-tuskar-ui-extras b/elements/tuskar-ui-extras/install.d/package-installs-tuskar-ui-extras deleted file mode 100644 index d3d509890..000000000 --- a/elements/tuskar-ui-extras/install.d/package-installs-tuskar-ui-extras +++ /dev/null @@ -1 +0,0 @@ -tuskar-ui-extras diff --git a/elements/tuskar-ui-extras/os-refresh-config/post-configure.d/102-tuskar-ui-extras b/elements/tuskar-ui-extras/os-refresh-config/post-configure.d/102-tuskar-ui-extras deleted file mode 100755 index 7bbb3c9e5..000000000 --- a/elements/tuskar-ui-extras/os-refresh-config/post-configure.d/102-tuskar-ui-extras +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -if [ -n "${HORIZON_VENV_DIR:-}" ]; then - set +u - source $HORIZON_VENV_DIR/bin/activate - set -u - LOCAL_SETTINGS_FILE=$HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py - DJANGO_ADMIN=django-admin.py -else - export PYTHONPATH=/usr/share/openstack-dashboard - LOCAL_SETTINGS_FILE=/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py - DJANGO_ADMIN=django-admin -fi - -source /root/stackrc - -DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN collectstatic --noinput -DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN compress --force - -if [ -n "${HORIZON_VENV_DIR:-}" ]; then - set +u - deactivate - set -u -fi - -os-svc-enable -n apache2 -os-svc-restart -n apache2 diff --git a/elements/undercloud-package-install/environment.d/00-package-install b/elements/undercloud-package-install/environment.d/00-package-install index e4a8b367e..14d603f39 100755 --- a/elements/undercloud-package-install/environment.d/00-package-install +++ b/elements/undercloud-package-install/environment.d/00-package-install @@ -20,8 +20,6 @@ export DIB_INSTALLTYPE_ceilometer=${DIB_INSTALLTYPE_ceilometer:-package} export DIB_INSTALLTYPE_ironic=${DIB_INSTALLTYPE_ironic:-package} export DIB_INSTALLTYPE_nova=${DIB_INSTALLTYPE_nova:-package} export DIB_INSTALLTYPE_horizon=${DIB_INSTALLTYPE_horizon:-package} -export DIB_INSTALLTYPE_tuskar=${DIB_INSTALLTYPE_tuskar:-package} -export DIB_INSTALLTYPE_tuskar_ui=${DIB_INSTALLTYPE_tuskar_ui:-package} # Clients export DIB_INSTALLTYPE_python_cinderclient=${DIB_INSTALLTYPE_python_cinderclient:-package} @@ -33,8 +31,7 @@ export DIB_INSTALLTYPE_python_novaclient=${DIB_INSTALLTYPE_python_novaclient:-pa export DIB_INSTALLTYPE_python_swiftclient=${DIB_INSTALLTYPE_python_swiftclient:-package} export DIB_INSTALLTYPE_python_ceilometerclient=${DIB_INSTALLTYPE_python_ceilometerclient:-package} export DIB_INSTALLTYPE_python_ironicclient=${DIB_INSTALLTYPE_python_ironicclient:-package} -export DIB_INSTALLTYPE_python_tuskarclient=${DIB_INSTALLTYPE_python_tuskarclient:-package} -export DIB_INSTALLTYPE_python_openstackclient=${DIB_INSTALLTYPE_python_tuskarclient:-package} +export DIB_INSTALLTYPE_python_openstackclient=${DIB_INSTALLTYPE_python_openstackclient:-package} # os-*-config export DIB_INSTALLTYPE_os_collect_config=${DIB_INSTALLTYPE_os_collect_config:-package} diff --git a/elements/undercloud-stack-config/config.json.template b/elements/undercloud-stack-config/config.json.template index 34c325c84..fbe728b53 100644 --- a/elements/undercloud-stack-config/config.json.template +++ b/elements/undercloud-stack-config/config.json.template @@ -48,15 +48,6 @@ "ironic": { "service-password": "{{UNDERCLOUD_IRONIC_PASSWORD}}" }, - "tuskar": { - "service-password": "{{UNDERCLOUD_TUSKAR_PASSWORD}}", - "db": "mysql://tuskar:{{UNDERCLOUD_TUSKAR_PASSWORD}}@localhost/tuskar?charset=utf8", - "heat_keystone": { - "username": "admin", - "password": "unset", - "tenant_name": "admin" - } - }, "bootstrap_host": { "bootstrap_nodeid": "undercloud", "nodeid": "undercloud" diff --git a/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata b/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata index 3ee892f7f..abc64a1fc 100755 --- a/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata +++ b/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata @@ -26,7 +26,6 @@ context = { 'DISCOVERY_INTERFACE': os.environ.get('DISCOVERY_INTERFACE', 'br-ctlplane'), 'DISCOVERY_IPRANGE': os.environ.get('DISCOVERY_IPRANGE', '192.0.2.100,192.0.2.120'), 'DISCOVERY_RUNBENCH': os.environ.get('DISCOVERY_RUNBENCH', '0'), - 'UNDERCLOUD_TUSKAR_PASSWORD': os.environ.get('UNDERCLOUD_TUSKAR_PASSWORD', 'unset'), 'UNDERCLOUD_IRONIC_PASSWORD': os.environ.get('UNDERCLOUD_IRONIC_PASSWORD', 'unset'), 'UNDERCLOUD_SERVICE_CERTIFICATE': os.environ.get('UNDERCLOUD_SERVICE_CERTIFICATE', ''), 'UNDERCLOUD_PUBLIC_VIP': os.environ.get('UNDERCLOUD_PUBLIC_VIP', ''), diff --git a/elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords b/elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords index de71157e3..fb7b7bc45 100644 --- a/elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords +++ b/elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords @@ -19,4 +19,3 @@ UNDERCLOUD_RABBIT_USERNAME=$(sudo hiera rabbit_username) UNDERCLOUD_SWIFT_HASH_SUFFIX=$(sudo hiera swift::swift_hash_suffix) UNDERCLOUD_SWIFT_PASSWORD=$(sudo hiera swift::proxy::authtoken::admin_password) UNDERCLOUD_MISTRAL_PASSWORD=$(sudo hiera mistral::admin_password) -UNDERCLOUD_TUSKAR_PASSWORD={{tuskar.service-password}} diff --git a/elements/undercloud-stack-config/os-refresh-config/configure.d/80-tuskar-db-create b/elements/undercloud-stack-config/os-refresh-config/configure.d/80-tuskar-db-create deleted file mode 100755 index 3e22657c4..000000000 --- a/elements/undercloud-stack-config/os-refresh-config/configure.d/80-tuskar-db-create +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -# This should run before configure.d/90-tuskar-db-sync - -UNDERCLOUD_TUSKAR_PASSWORD=$(os-apply-config --key tuskar.service-password) - -os-db-create tuskar tuskar $UNDERCLOUD_TUSKAR_PASSWORD diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index f15dea12f..3bb826fa0 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -167,10 +167,6 @@ _opts = [ help=('Whether to enable the debug log level for Undercloud ' 'OpenStack services.') ), - cfg.BoolOpt('enable_tuskar', - default=False, - help=('Whether to install Tuskar services in the Undercloud.') - ), cfg.BoolOpt('enable_tempest', default=True, help=('Whether to install Tempest in the Undercloud.') @@ -223,10 +219,6 @@ _auth_opts = [ help=('Ironic service password. ' 'If left unset, one will be automatically generated.') ), - cfg.StrOpt('undercloud_tuskar_password', - help=('Tuskar service password. ' - 'If left unset, one will be automatically generated.') - ), cfg.StrOpt('undercloud_aodh_password', help=('Aodh service password. ' 'If left unset, one will be automatically generated.') diff --git a/undercloud.conf.sample b/undercloud.conf.sample index 44e7f37df..7c0a6bc24 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -76,10 +76,6 @@ # services. (boolean value) #undercloud_debug = true -# Whether to install Tuskar services in the Undercloud. (boolean -# value) -#enable_tuskar = false - # Whether to install Tempest in the Undercloud. (boolean value) #enable_tempest = true @@ -132,10 +128,6 @@ # generated. (string value) #undercloud_ironic_password = -# Tuskar service password. If left unset, one will be automatically -# generated. (string value) -#undercloud_tuskar_password = - # Ceilometer service password. If left unset, one will be # automatically generated. (string value) #undercloud_ceilometer_password =