Revert "Add code to support novajoin in the undercloud"

The most recent patch set in this change never passed ci.  Since
we're now having nova issues in the undercloud, I'm trying a
revert to see if it fixes the problem.

Closes-Bug: 1655171

This reverts commit 3a12ee67e4.

Change-Id: Ic0f500d7d8b832981664f164314756dd7e224f10
This commit is contained in:
Ben Nemec 2017-01-09 23:04:21 +00:00
parent 3a12ee67e4
commit 039eb66b89
4 changed files with 0 additions and 37 deletions

View File

@ -624,8 +624,3 @@ Service[$needless_services] {
enable => false,
ensure => stopped,
}
# novajoin install
if str2bool(hiera('enable_novajoin', false)) {
include ::nova::metadata::novajoin::api
}

View File

@ -676,26 +676,12 @@ enable_telemetry: {{ENABLE_TELEMETRY}}
enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
enable_ui: {{ENABLE_UI}}
enable_cinder: {{ENABLE_CINDER}}
enable_novajoin: {{ENABLE_NOVAJOIN}}
# Path to install configuration files
tripleo_install_user: {{TRIPLEO_INSTALL_USER}}
tripleo_undercloud_conf_file: {{TRIPLEO_UNDERCLOUD_CONF_FILE}}
tripleo_undercloud_password_file: {{TRIPLEO_UNDERCLOUD_PASSWORD_FILE}}
# Novajoin
nova::metadata::novajoin::api::keystone_auth_url: "%{hiera('keystone_auth_uri')}"
nova::metadata::novajoin::api::nova_password: {{UNDERCLOUD_NOVA_PASSWORD}}
nova::metadata::novajoin::api::transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP}}//"
ipaclient::password: {{IPA_OTP}}
ipaclient::hostname: {{UNDERCLOUD_HOSTNAME}}
{{#ENABLE_NOVAJOIN}}
nova::api::vendordata_jsonfile_path: '/etc/nova/cloud-config.json'
nova::api::vendordata_providers: ['StaticJSON', 'DynamicJSON']
nova::api::vendordata_dynamic_targets: ['join@http://127.0.0.1:9999/v1/']
nova::notification_topics: 'notifications'
nova::notify_on_state_change: 'vm_state'
{{/ENABLE_NOVAJOIN}}
# Firewall
tripleo::firewall::manage_firewall: true

View File

@ -299,15 +299,6 @@ _opts = [
help=('Whether to enable legacy ceilometer api '
'in the Undercloud.')
),
cfg.BoolOpt('enable_novajoin',
default=False,
help=('Whether to install novajoin metadata service in '
'the Undercloud.')
),
cfg.StrOpt('ipa_otp',
help=('One Time Password to register Undercloud node with '
'an IPA server.')
),
cfg.BoolOpt('ipxe_enabled',
default=True,
help=('Whether to use iPXE for deploy and inspection.'),

View File

@ -165,15 +165,6 @@
# Undercloud. (boolean value)
#enable_legacy_ceilometer_api = false
# Whether to install novajoin metadata service in the Undercloud.
# (boolean value)
#enable_novajoin = false
# One Time Password to register Undercloud node with IPA server.
# Required when enable_novajoin = true.
# (string value)
#ipa_otp =
# Whether to use iPXE for deploy and inspection. (boolean value)
# Deprecated group/name - [DEFAULT]/ipxe_deploy
#ipxe_enabled = true