diff options
| -rw-r--r-- | controller.yaml | 4 | ||||
| -rw-r--r-- | environments/README.md | 13 | ||||
| -rw-r--r-- | environments/puppet-ceph-devel.yaml | 16 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 4 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 6 | ||||
| -rw-r--r-- | puppet/all-nodes-config.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/common.yaml | 8 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 24 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_object.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_volume.pp | 2 |
14 files changed, 63 insertions, 32 deletions
diff --git a/controller.yaml b/controller.yaml index bbac3a68..d7ba1a10 100644 --- a/controller.yaml +++ b/controller.yaml @@ -208,10 +208,6 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true - MysqlClustercheckPassword: - type: string - hidden: true - default: '' # Has to be here because of the ignored empty value bug MysqlClusterUniquePart: description: A unique identifier of the MySQL cluster the controller is in. type: string diff --git a/environments/README.md b/environments/README.md new file mode 100644 index 00000000..4111f7ed --- /dev/null +++ b/environments/README.md @@ -0,0 +1,13 @@ +This directory contains Heat environment file snippets which can +be used to enable features in the Overcloud. + +Configuration +------------- + +These can be enabled using the -e [path to environment yaml] option with +heatclient. + +Below is an example of how to enable the Ceph template using +devtest\_overcloud.sh: + + export OVERCLOUD\_CUSTOM\_HEAT\_ENV=$TRIPLEO\_ROOT/tripleo-heat-templates/environments/ceph_devel.yaml diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml new file mode 100644 index 00000000..d782e8d8 --- /dev/null +++ b/environments/puppet-ceph-devel.yaml @@ -0,0 +1,16 @@ +# A Heat environment file which can be used to enable a Ceph +# storage cluster using the controller and 2 ceph nodes. +# Rbd backends are enabled for Cinder, Glance, and Nova. +parameters: + CephStorageCount: 2 + #NOTE: These ID's and keys should be regenerated for + # a production deployment. What is here is suitable for + # developer and CI testing only. + CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' + CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' + CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' + NovaEnableRbdBackend: true + CinderEnableRbdBackend: true + GlanceBackend: rbd + CinderEnableIscsiBackend: false + ControllerEnableCephStorage: true diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml new file mode 100644 index 00000000..f235cf8f --- /dev/null +++ b/environments/puppet-pacemaker.yaml @@ -0,0 +1,4 @@ +# An environment which enables configuration of an +# Overcloud controller with Pacemaker. +resource_registry: + OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index d3f8c59d..70e197d2 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -598,7 +598,6 @@ resources: MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]} MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize} MysqlRootPassword: {get_attr: [MysqlRootPassword, value]} - MysqlClustercheckPassword: {get_attr: [MysqlClustercheckPassword, value]} NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP} NeutronFlatNetworks: {get_param: NeutronFlatNetworks} NeutronBridgeMappings: {get_param: NeutronBridgeMappings} @@ -761,11 +760,6 @@ resources: properties: length: 10 - MysqlClustercheckPassword: - type: OS::Heat::RandomString - properties: - length: 10 - MysqlClusterUniquePart: type: OS::Heat::RandomString properties: diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index ec7fa7fa..474426c2 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -42,10 +42,6 @@ resources: - list_join: - "\n" - {get_param: ceph_storage_hosts} - sysctl: - net.ipv4.tcp_keepalive_time: 5 - net.ipv4.tcp_keepalive_probes: 5 - net.ipv4.tcp_keepalive_intvl: 1 hiera: datafiles: all_nodes: diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index af1ee6fd..e13b66ae 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -226,10 +226,6 @@ parameters: type: string hidden: true default: '' # Has to be here because of the ignored empty value bug - MysqlClustercheckPassword: - type: string - hidden: true - default: '' # Has to be here because of the ignored empty value bug NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -556,7 +552,6 @@ resources: enable_swift_storage: {get_param: EnableSwiftStorage} mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} mysql_root_password: {get_param: MysqlRootPassword} - mysql_clustercheck_password: {get_param: MysqlClustercheckPassword} mysql_cluster_name: str_replace: template: tripleo-CLUSTER @@ -771,7 +766,6 @@ resources: mysql_innodb_buffer_pool_size: {get_input: mysql_innodb_buffer_pool_size} mysql::server::root_password: {get_input: mysql_root_password} mysql_cluster_name: {get_input: mysql_cluster_name} - mysql_clustercheck_password: {get_input: mysql_clustercheck_password} # Neutron neutron::bind_host: {get_input: controller_host} diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index b7fb84ab..c15d43ea 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -12,3 +12,11 @@ nova::network::neutron::neutron_admin_username: 'neutron' nova::network::neutron::vif_plugging_is_fatal: false nova::network::neutron::vif_plugging_timeout: 30 nova::network::neutron::dhcp_domain: '' + +sysctl_settings: + net.ipv4.tcp_keepalive_intvl: + value: 1 + net.ipv4.tcp_keepalive_probes: + value: 5 + net.ipv4.tcp_keepalive_time: + value: 5
\ No newline at end of file diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index ce2ab3af..b645f9fe 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) { } } +create_resources(sysctl::value, hiera('sysctl_settings'), {}) + if count(hiera('ntp::servers')) > 0 { include ::ntp } diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index ffa55cdb..caca89a8 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) { } } +create_resources(sysctl::value, hiera('sysctl_settings'), {}) + if count(hiera('ntp::servers')) > 0 { include ::ntp } diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index a11df054..27272643 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -26,6 +26,8 @@ if !str2bool(hiera('enable_package_install', 'false')) { if hiera('step') >= 1 { + create_resources(sysctl::value, hiera('sysctl_settings'), {}) + $controller_node_ips = split(hiera('controller_node_ips'), ',') class { '::tripleo::loadbalancer' : diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 9184f8b9..ce8e81ee 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -44,6 +44,8 @@ $non_pcmk_start = hiera('step') >= 4 if hiera('step') >= 1 { + create_resources(sysctl::value, hiera('sysctl_settings'), {}) + if count(hiera('ntp::servers')) > 0 { include ::ntp } @@ -57,7 +59,7 @@ if hiera('step') >= 1 { haproxy_service_manage => false, } - $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G') + $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G')) user { 'hacluster': ensure => present, } -> @@ -110,8 +112,6 @@ if hiera('step') >= 1 { } $galera_nodes = downcase(hiera('galera_node_names', $::hostname)) $galera_nodes_count = count(split($galera_nodes, ',')) - $clustercheck_password = hiera('mysql_clustercheck_password') - $mysql_root_password = hiera('mysql::server::root_password') $mysqld_options = { 'mysqld' => { @@ -190,8 +190,8 @@ if hiera('step') >= 2 { $mongodb_cluster_ready_command = join(suffix(prefix($mongo_node_ips, '/bin/nc -w1 '), ' 27017 < /dev/null'), ' && ') exec { 'mongodb-ready' : command => $mongodb_cluster_ready_command, - timeout => 600, - tries => 60, + timeout => 30, + tries => 180, try_sleep => 10, } mongodb_replset { $mongodb_replset : @@ -236,19 +236,19 @@ if hiera('step') >= 2 { } exec { 'galera-ready' : - command => '/bin/mysql -e "SHOW GLOBAL VARIABLES LIKE \'read_only\'" | /bin/grep -i off', - timeout => 600, - tries => 60, + command => '/usr/bin/clustercheck >/dev/null', + timeout => 30, + tries => 180, try_sleep => 10, - environment => 'HOME=/root', + environment => ["AVAILABLE_WHEN_READONLY=0"], + require => File['/etc/sysconfig/clustercheck'], } file { '/etc/sysconfig/clustercheck' : ensure => file, - content => "MYSQL_USERNAME=clustercheckuser\n -MYSQL_PASSWORD=${clustercheck_password}\n + content => "MYSQL_USERNAME=root\n +MYSQL_PASSWORD=''\n MYSQL_HOST=localhost\n", - require => Exec['galera-ready'], } xinetd::service { 'galera-monitor' : diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp index 8d0ad783..24799c8c 100644 --- a/puppet/manifests/overcloud_object.pp +++ b/puppet/manifests/overcloud_object.pp @@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) { } } +create_resources(sysctl::value, hiera('sysctl_settings'), {}) + if count(hiera('ntp::servers')) > 0 { include ::ntp } diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index 3d7cb490..80cf6a21 100644 --- a/puppet/manifests/overcloud_volume.pp +++ b/puppet/manifests/overcloud_volume.pp @@ -24,6 +24,8 @@ if str2bool(hiera('disable_package_install', 'false')) { } } +create_resources(sysctl::value, hiera('sysctl_settings'), {}) + if count(hiera('ntp::servers')) > 0 { include ::ntp } |