Bugfixing for latest contrail
- typos fixed - cassandra-related changes applied for all nodes - pip packages list updated Change-Id: I2b0fe1fab7783e027c5c8443dcf0e4b062a65c9e
This commit is contained in:
parent
d59eac9255
commit
686e9ac114
|
@ -12,7 +12,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include contrail
|
||||
case $operatingsystem
|
||||
{
|
||||
CentOS:
|
||||
|
|
|
@ -31,7 +31,7 @@ if $contrail::node_name =~ /^contrail.\d+$/ {
|
|||
}
|
||||
$pkgs = ['python-crypto','python-netaddr','python-paramiko','ifenslave-2.6','patch',
|
||||
'openjdk-7-jre-headless','contrail-fabric-utils','contrail-setup']
|
||||
$pip_pkgs = ['ecdsa-0.10','Fabric-1.7.5']
|
||||
$pip_pkgs = ['Fabric-1.7.5']
|
||||
}
|
||||
CentOS:
|
||||
{
|
||||
|
@ -43,6 +43,11 @@ if $contrail::node_name =~ /^contrail.\d+$/ {
|
|||
class { 'contrail::package':
|
||||
install => $pkgs,
|
||||
pip_install => $pip_pkgs,
|
||||
}
|
||||
} ->
|
||||
|
||||
exec {'cassandra_mindisk':
|
||||
command => '/bin/sed -i -e "30s/minimum_diskGB.*/minimum_diskGB\':\ \'32\'\,/" /usr/local/lib/python2.7/dist-packages/contrail_provisioning/database/setup.py',
|
||||
creates => '/opt/contrail/cassandra_mindisk-DONE'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
+++ /opt/contrail/utils/fabfile/tasks/install.py
|
||||
@@ -171,10 +171,7 @@
|
||||
run(cmd)
|
||||
|
||||
--- /opt/contrail/utils/fabfile/tasks/install.py 2015-06-09 20:15:26.809587058 +0000
|
||||
+++ /opt/contrail/utils/fabfile/tasks/install.py_new 2015-06-09 20:08:40.031819798 +0000
|
||||
@@ -208,10 +208,7 @@
|
||||
sudo(cmd)
|
||||
|
||||
def yum_install(rpms, disablerepo = True):
|
||||
- if disablerepo:
|
||||
- cmd = "yum -y --nogpgcheck --disablerepo=* --enablerepo=contrail_install_repo install "
|
||||
- cmd = "yum -y --nogpgcheck --disablerepo=* --enablerepo=contrail* install "
|
||||
- else:
|
||||
- cmd = "yum -y --nogpgcheck install "
|
||||
+ cmd = "yum -y --nogpgcheck install "
|
||||
os_type = detect_ostype()
|
||||
# redhat platform installs from multiple repos
|
||||
if os_type in ['redhat']:
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@ $nodes= hiera('nodes')
|
|||
$neutron_settings=hiera('quantum_settings')
|
||||
$metadata_secret=$neutron_settings['metadata']['metadata_proxy_shared_secret']
|
||||
#$service_token = $neutron_settings['keystone']['admin_password']
|
||||
$service_token = $admin_token
|
||||
$keystone=hiera('keystone')
|
||||
$admin_token = $keystone['admin_token']
|
||||
$service_token = $admin_token
|
||||
|
||||
$mos_mgmt_vip=hiera('management_vip')
|
||||
|
||||
|
|
|
@ -20,10 +20,6 @@ class contrail::setup ($node_name)
|
|||
'Ubuntu' => '/usr/local/lib/python2.7/dist-packages',
|
||||
'CentOS' => '/usr/lib/python2.6/site-packages'
|
||||
}
|
||||
exec {'cassandra_mindisk':
|
||||
command => '/bin/sed -i -e "s/minimum_diskGB.*/minimum_diskGB\':\ \'32\'\,/" /usr/local/lib/python2.7/dist-packages/contrail_provisioning/database/setup.py',
|
||||
creates => '/opt/contrail/cassandra_mindisk-DONE'
|
||||
} ->
|
||||
file {'/tmp/install.py.patch':
|
||||
ensure => file,
|
||||
source => 'puppet:///modules/contrail/install.py.patch'
|
||||
|
@ -37,7 +33,7 @@ class contrail::setup ($node_name)
|
|||
source => 'puppet:///modules/contrail/commandline.py.patch'
|
||||
} ->
|
||||
exec {'commandline.py.patch':
|
||||
command => 'patch /opt/contrail/utils/fabfile/util/commandline.py /tmp/commandline.py.patch',
|
||||
command => 'patch /opt/contrail/utils/fabfile/utils/commandline.py /tmp/commandline.py.patch',
|
||||
creates => '/opt/contrail/commandline.py.patch-DONE'
|
||||
} ->
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@ env.ostypes = {
|
|||
<%- end -%>
|
||||
}
|
||||
env.openstack = {
|
||||
'service_token' : '<%= scope.loopkupvar('contrail::service_token') %>'
|
||||
'service_token' : '<%= scope.lookupvar('contrail::service_token') %>'
|
||||
}
|
||||
|
||||
env.ha = {
|
||||
|
|
Loading…
Reference in New Issue