summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-08-30 17:04:20 +0200
committerRomanos Skiadas <rski@intracom-telecom.com>2016-11-09 12:38:19 +0200
commit7d90856a02fce1a379dcaf2c32dd9d5f6088c229 (patch)
tree6d90fccf6232a95aaf97949297529f1c5860f9d0
parent0c85aa25efd3f47008effe9f469d86073df18e12 (diff)
Installing same ovs version on the controllerstable/9.0
This is a cherry pick of I454a9e6e577bca65a8ac54a55b44cc40b7f238fa This commit also brings in the bugfix for this, cherry-picked from Ifa961240d1ccd53e56b93d5afae7da0df26c1e34 Change-Id: I43ae6e99ef5a6ab9b6d580f27390e42528c1e8ff Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
Notes
Notes (review): Code-Review+2: Michal Skalski <mskalski@mirantis.com> Workflow+1: Michal Skalski <mskalski@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 09 Nov 2016 12:30:28 +0000 Reviewed-on: https://review.openstack.org/395515 Project: openstack/fuel-plugin-ovs Branch: refs/heads/stable/9.0
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install-compute.pp17
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install.pp21
-rw-r--r--deployment_tasks.yaml6
-rw-r--r--environment_config.yaml5
4 files changed, 29 insertions, 20 deletions
diff --git a/deployment_scripts/puppet/manifests/ovs-install-compute.pp b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
deleted file mode 100644
index d10a37c..0000000
--- a/deployment_scripts/puppet/manifests/ovs-install-compute.pp
+++ /dev/null
@@ -1,17 +0,0 @@
1# get options
2$master_ip = hiera('master_ip')
3$ovs_settings = hiera('fuel-plugin-ovs')
4$dpdk = hiera('dpdk')
5
6$install_nsh = $ovs_settings['install_nsh']
7$install_dpdk = $ovs_settings['install_dpdk']
8$ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
9
10
11if $operatingsystem == 'Ubuntu' {
12 exec { 'install ovs_nsh_dpdk':
13 command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
14 path => "/usr/bin:/usr/sbin:/bin:/sbin",
15 }
16} elsif $operatingsystem == 'CentOS' {
17}
diff --git a/deployment_scripts/puppet/manifests/ovs-install.pp b/deployment_scripts/puppet/manifests/ovs-install.pp
new file mode 100644
index 0000000..9cdcf59
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/ovs-install.pp
@@ -0,0 +1,21 @@
1notice('MODULAR: ovs-install.pp')
2# get options
3$master_ip = hiera('master_ip')
4$ovs_settings = hiera('fuel-plugin-ovs')
5$dpdk = hiera('dpdk')
6
7$install_nsh = $ovs_settings['install_nsh']
8$install_dpdk = $ovs_settings['install_dpdk']
9$install_on_controller = $ovs_settings['install_on_controller']
10$ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
11
12
13if $operatingsystem == 'Ubuntu' {
14 if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
15 exec { 'install ovs_nsh_dpdk':
16 command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
17 path => '/usr/bin:/usr/sbin:/bin:/sbin',
18 }
19 }
20} elsif $operatingsystem == 'CentOS' {
21}
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index ea94784..fa29bb0 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,13 +1,13 @@
1- id: ovs_install_compute 1- id: ovs_install
2 type: puppet 2 type: puppet
3 version: 2.1.0 3 version: 2.1.0
4 groups: [compute] 4 groups: [compute, primary-controller, controller]
5 requires: [allocate_hugepages] 5 requires: [allocate_hugepages]
6 required_for: [netconfig] 6 required_for: [netconfig]
7 condition: 7 condition:
8 yaql_exp: changedAny($.get('fuel-plugin-ovs'), $.get('dpdk')) 8 yaql_exp: changedAny($.get('fuel-plugin-ovs'), $.get('dpdk'))
9 parameters: 9 parameters:
10 puppet_manifest: puppet/manifests/ovs-install-compute.pp 10 puppet_manifest: puppet/manifests/ovs-install.pp
11 puppet_modules: puppet/modules:/etc/puppet/modules 11 puppet_modules: puppet/modules:/etc/puppet/modules
12 timeout: 720 12 timeout: 720
13 13
diff --git a/environment_config.yaml b/environment_config.yaml
index a7931f3..3a1fe53 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -9,3 +9,8 @@ attributes:
9 weight: 20 9 weight: 20
10 value: false 10 value: false
11 label: "Install NSH" 11 label: "Install NSH"
12 install_on_controller:
13 type: "checkbox"
14 weight: 20
15 value: false
16 label: "Install same OVS version on the Controller"