diff options
author | Xuan Jia <jason.jiaxuan@gmail.com> | 2017-07-04 01:01:20 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-04 01:01:20 +0000 |
commit | b4804ed0b8d88fc91324dfbbf9e285d0691bb0f4 (patch) | |
tree | 31c0f7ed501766ea7ec041b858bfa49935cfb487 /src/fuel-plugin/deployment_scripts/puppet | |
parent | d2e76f3f7ae0d7da12f054cecddfbd344801ddc5 (diff) | |
parent | 1ca39e1362e916059fc4ef6227e16b33d0dfd3df (diff) |
Merge "cleanup: remove fuel-plugin since fuel@opnfv use mccp"
Diffstat (limited to 'src/fuel-plugin/deployment_scripts/puppet')
-rw-r--r-- | src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-master-install.pp | 22 | ||||
-rw-r--r-- | src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp | 15 |
2 files changed, 0 insertions, 37 deletions
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-master-install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-master-install.pp deleted file mode 100644 index 8c52fad..0000000 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-master-install.pp +++ /dev/null @@ -1,22 +0,0 @@ -notice('MODULAR: k8s-master-install') -# get options - -$network_metadata = hiera_hash('network_metadata') -$k8s_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['k8s-master']) -$k8s_mgmt_ips_hash = get_node_to_ipaddr_map_by_network_role($k8s_nodes_hash, 'management') -$k8s_mgmt_ips = values($k8s_mgmt_ips_hash) - -$network_scheme = hiera_hash('network_scheme') -$service_cidr = $network_scheme['endpoints']['br-mgmt']['IP'] - -$k8s_settings = hiera_hash('fuel-plugin-k8s') -$pod_network = $k8s_settings['pod_network'] -$pod_network_cidr = $k8s_settings['pod_network_cidr'] - -if $operatingsystem == 'Ubuntu' { - exec { 'install k8s master': - command => "/etc/fuel/plugins/fuel-plugin-k8s-1.0/k8s-master-install.sh $k8s_mgmt_ips $service_cidr $pod_network $pod_network_cidr", - path => '/usr/bin:/usr/sbin:/bin:/sbin', - } -} elsif $operatingsystem == 'CentOS' { -} diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp deleted file mode 100644 index 4e4863b..0000000 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp +++ /dev/null @@ -1,15 +0,0 @@ -notice('MODULAR: k8s-slave-install') -# get options - -$network_metadata = hiera_hash('network_metadata') -$k8s_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['k8s-master']) -$k8s_mgmt_ips_hash = get_node_to_ipaddr_map_by_network_role($k8s_nodes_hash, 'management') -$k8s_mgmt_ips = values($k8s_mgmt_ips_hash) - -if $operatingsystem == 'Ubuntu' { - exec { 'install k8s slave': - command => "/etc/fuel/plugins/fuel-plugin-k8s-1.0/k8s-slave-install.sh $k8s_mgmt_ips", - path => '/usr/bin:/usr/sbin:/bin:/sbin', - } -} elsif $operatingsystem == 'CentOS' { -} |