openstack/instack-undercloud
Code Issues Proposed changes

Remove option of installing tuskar

Browse Source 
This isn't supported anymore and likely doesn't work, so let's just
remove it.

Change-Id: If31fe9e602323022eb99eddb786492462c09157e
This commit is contained in:
Ben Nemec
2015-12-15 17:48:45 +00:00
committed by Jiri Stransky
parent 04a4b0b8e9
commit 9f5f3191ac
14 changed files with 1 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/install.d/02-puppet-stack-config
View File

@@ -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'),

20
elements/puppet-stack-config/puppet-stack-config.pp
View File

@@ -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'),

9
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@@ -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}}

1
elements/tuskar-ui-extras/README.md
View File

@@ -1 +0,0 @@
Element that provides additional plugins for the tuskar-ui.

1
elements/tuskar-ui-extras/element-deps
View File

@@ -1 +0,0 @@
tuskar-ui

1
elements/tuskar-ui-extras/install.d/package-installs-tuskar-ui-extras
View File

@@ -1 +0,0 @@
tuskar-ui-extras

29
elements/tuskar-ui-extras/os-refresh-config/post-configure.d/102-tuskar-ui-extras
View File

@@ -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

5
elements/undercloud-package-install/environment.d/00-package-install
View File

@@ -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}

9
elements/undercloud-stack-config/config.json.template
View File

@@ -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"

1
elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata
View File

@@ -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', ''),

1
elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords
View File

@@ -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}}

10
elements/undercloud-stack-config/os-refresh-config/configure.d/80-tuskar-db-create
View File

@@ -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

8
instack_undercloud/undercloud.py
View File

@@ -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.')

8
undercloud.conf.sample
View File

@@ -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 = <None>
# Tuskar service password. If left unset, one will be automatically
# generated. (string value)
#undercloud_tuskar_password = <None>
# Ceilometer service password. If left unset, one will be
# automatically generated. (string value)
#undercloud_ceilometer_password = <None>