Restructuring Gluon puppet manifests

Structuring the puppet manifests similar to how it is done in
OpenDaylight and etcd.

Change-Id: I9d0fb60ddd626129b38b1f642ce3894ca3098cc4
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>

7 files changed, 60 insertions, 8 deletions

diff --git a/deploy/puppet/gluon/manifests/config.pp b/deploy/puppet/gluon/manifests/config.pp
new file mode 100644
index 0000000..4cfad19
--- /dev/null
+++ b/deploy/puppet/gluon/manifests/config.pp
@@ -0,0 +1,11 @@
+class gluon::config {
+
+  file { '/etc/proton/proton-shim.conf':
+    ensure  => 'file',
+    owner   => 'proton',
+    group   => 'proton',
+    mode    => '640',
+    content => template('gluon/proton-shim.conf.erb'),
+  }
+
+}
diff --git a/deploy/puppet/gluon/manifests/gluon-install.pp b/deploy/puppet/gluon/manifests/gluon-install.pp
deleted file mode 100644
index c694b32..0000000
--- a/deploy/puppet/gluon/manifests/gluon-install.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-notice('MODULAR: gluon-install.pp')
-include gluon
-
-class { 'gluon::install': }
diff --git a/deploy/puppet/gluon/manifests/gluon-post.pp b/deploy/puppet/gluon/manifests/gluon-post.pp
deleted file mode 100644
index e32f424..0000000
--- a/deploy/puppet/gluon/manifests/gluon-post.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-notice('MODULAR: gluon-post.pp')
-include gluon
-
-class { 'gluon::post': }
diff --git a/deploy/puppet/gluon/manifests/init.pp b/deploy/puppet/gluon/manifests/init.pp
new file mode 100644
index 0000000..ec1e036
--- /dev/null
+++ b/deploy/puppet/gluon/manifests/init.pp
@@ -0,0 +1,15 @@
+class gluon inherits ::gluon::params {
+
+  $odl_bind_ip      = hiera(opendaylight::odl_bind_ip, $::gluon::params::odl_bind_ip)
+  $odl_rest_port    = hiera(opendaylight::odl_rest_port, $::gluon::params::odl_rest_port)
+  $odl_username     = hiera(opendaylight::username, $::gluon::params::odl_username)
+  $odl_password     = hiera(opendaylight::password, $::gluon::params::odl_password)
+  $etcd_bind_ip     = hiera(etcd::bind_ip, $::gluon::params::etcd_bind_ip)
+  $etcd_client_port = hiera(etcd::client_port, $::gluon::params::etcd_client_port)
+
+  class { '::gluon::install': } ->
+  class { '::gluon::config': } ~>
+  class { '::gluon::service': } ->
+  Class['::gluon']
+
+}
diff --git a/deploy/puppet/gluon/manifests/install.pp b/deploy/puppet/gluon/manifests/install.pp
new file mode 100644
index 0000000..234da49
--- /dev/null
+++ b/deploy/puppet/gluon/manifests/install.pp
@@ -0,0 +1,11 @@
+class gluon::install {
+
+  package { 'python-click':
+    ensure   => installed,
+  }
+
+  package { 'gluon':
+    ensure   => installed,
+  }
+
+}
diff --git a/deploy/puppet/gluon/manifests/params.pp b/deploy/puppet/gluon/manifests/params.pp
new file mode 100644
index 0000000..2af3cb7
--- /dev/null
+++ b/deploy/puppet/gluon/manifests/params.pp
@@ -0,0 +1,10 @@
+class gluon::params {
+
+  $odl_bind_ip      = '0.0.0.0'
+  $odl_rest_port    = '8181'
+  $odl_username     = 'admin'
+  $odl_password     = 'admin'
+  $etcd_bind_ip     = '127.0.0.1'
+  $etcd_client_port = '2379'
+
+}
diff --git a/deploy/puppet/gluon/manifests/service.pp b/deploy/puppet/gluon/manifests/service.pp
new file mode 100644
index 0000000..b909d54
--- /dev/null
+++ b/deploy/puppet/gluon/manifests/service.pp
@@ -0,0 +1,13 @@
+class gluon::service {
+
+  service { 'openstack-proton-server':
+    ensure   => running,
+    enable   => true,
+  }
+
+  service { 'openstack-proton-shim-server':
+    ensure   => running,
+    enable   => true,
+  }
+
+}