This patch adds qpidd to the wui, configures a DNS SRV record for
its address, opens up the firewall port, creates a config for qpidd
etc.
Signed-off-by: Ian Main <imain at redhat.com>
---
Makefile.am | 1 +
appliances/ovirt/files/ovirt-server-appliance | 1 +
appliances/ovirt/files/qpidd.conf | 5 +++++
appliances/ovirt/ovirt.pp.in | 10 ++++++++++
ovirt-recipe.spec.in | 4 ++++
5 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 appliances/ovirt/files/qpidd.conf
diff --git a/Makefile.am b/Makefile.am
index 0b4e2b9..37751af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
appliances/ovirt/ovirt.pp \
appliances/ovirt/ovirt.pp.in \
appliances/ovirt/files/collectd.conf \
+ appliances/ovirt/files/qpidd.conf \
appliances/ovirt/files/ovirt-cfgdb \
appliances/ovirt/files/ovirt.repo \
appliances/ovirt/files/ovirt-server-appliance \
diff --git a/appliances/ovirt/files/ovirt-server-appliance
b/appliances/ovirt/files/ovirt-server-appliance
index 0f48402..778d0ce 100644
--- a/appliances/ovirt/files/ovirt-server-appliance
+++ b/appliances/ovirt/files/ovirt-server-appliance
@@ -19,6 +19,7 @@ start() {
-W _ipa._tcp,management.priv.ovirt.org,80 \
-W _ldap._tcp,management.priv.ovirt.org,389 \
-W _collectd._tcp,management.priv.ovirt.org,25826 \
+ -W _qpidd._tcp,management.priv.ovirt.org,5672 \
-W _identify._tcp,management.priv.ovirt.org,12120 \
--enable-tftp --tftp-root=/var/lib/tftpboot -M pxelinux.0 \
-O option:router,192.168.50.2 -O option:ntp-server,192.168.50.2 \
diff --git a/appliances/ovirt/files/qpidd.conf
b/appliances/ovirt/files/qpidd.conf
new file mode 100644
index 0000000..a7e34bb
--- /dev/null
+++ b/appliances/ovirt/files/qpidd.conf
@@ -0,0 +1,5 @@
+# Configuration file for qpidd. Entries are of the form:
+# name = value
+# Using default settings: "qpidd --help" or "man qpidd" for
more details.
+auth=no
+
diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 1ee8b48..5d7e9e8 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -83,6 +83,10 @@ file {"/etc/collectd.conf":
source => "puppet:///ovirt/collectd.conf"
}
+file {"/etc/qpidd.conf":
+ source => "puppet:///ovirt/qpidd.conf"
+}
+
file {"/var/www/html/ovirt-cfgdb":
source => "puppet:///ovirt/ovirt-cfgdb"
}
@@ -109,6 +113,7 @@ firewall_rule {"nfsd": destination_port =>
'2049'}
firewall_rule {"rpcbind": destination_port => '111'}
firewall_rule {"rpcbind-udp": destination_port => '111',
protocol => 'udp'}
firewall_rule {"host-browser": destination_port =>
'12120'}
+firewall_rule {"qpidd": destination_port => '5672'}
firewall_rule {"rpc.mountd": destination_port => '892'}
firewall_rule {"rpc.mountd-udp": destination_port =>
'892', protocol => 'udp'}
firewall_rule {"rpc.statd": destination_port => '662'}
@@ -152,6 +157,11 @@ service {"nfslock":
require => [Service["network"]]
}
+service {"qpidd":
+ ensure => "running",
+ enable => true
+}
+
file {"/usr/sbin/ovirt-server-appliance-setup":
content => template("ovirt-server-appliance-setup.erb"),
mode => 755
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index c257e84..9fef6af 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -37,6 +37,10 @@ Requires: augeas
Requires: syslinux
Requires: lokkit
Requires: curl
+Requires: qpidd
+Requires: qpidc
+Requires: qmf
+Requires: python-qpid
%description
Thincrust oVirt Server Appliance Recipe
--
1.5.5.1
This patch adds qpidd to the wui, configures a DNS SRV record for
its address, opens up the firewall port, creates a config for qpidd
etc.
Amended: Seems I missed restarting qpidd so it will take
configuration changes.
Signed-off-by: Ian Main <imain at redhat.com>
---
Makefile.am | 1 +
appliances/ovirt/files/ovirt-server-appliance | 1 +
appliances/ovirt/files/qpidd.conf | 5 +++++
appliances/ovirt/ovirt.pp.in | 11 +++++++++++
ovirt-recipe.spec.in | 4 ++++
5 files changed, 22 insertions(+), 0 deletions(-)
create mode 100644 appliances/ovirt/files/qpidd.conf
diff --git a/Makefile.am b/Makefile.am
index 0b4e2b9..37751af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
appliances/ovirt/ovirt.pp \
appliances/ovirt/ovirt.pp.in \
appliances/ovirt/files/collectd.conf \
+ appliances/ovirt/files/qpidd.conf \
appliances/ovirt/files/ovirt-cfgdb \
appliances/ovirt/files/ovirt.repo \
appliances/ovirt/files/ovirt-server-appliance \
diff --git a/appliances/ovirt/files/ovirt-server-appliance
b/appliances/ovirt/files/ovirt-server-appliance
index 0f48402..778d0ce 100644
--- a/appliances/ovirt/files/ovirt-server-appliance
+++ b/appliances/ovirt/files/ovirt-server-appliance
@@ -19,6 +19,7 @@ start() {
-W _ipa._tcp,management.priv.ovirt.org,80 \
-W _ldap._tcp,management.priv.ovirt.org,389 \
-W _collectd._tcp,management.priv.ovirt.org,25826 \
+ -W _qpidd._tcp,management.priv.ovirt.org,5672 \
-W _identify._tcp,management.priv.ovirt.org,12120 \
--enable-tftp --tftp-root=/var/lib/tftpboot -M pxelinux.0 \
-O option:router,192.168.50.2 -O option:ntp-server,192.168.50.2 \
diff --git a/appliances/ovirt/files/qpidd.conf
b/appliances/ovirt/files/qpidd.conf
new file mode 100644
index 0000000..a7e34bb
--- /dev/null
+++ b/appliances/ovirt/files/qpidd.conf
@@ -0,0 +1,5 @@
+# Configuration file for qpidd. Entries are of the form:
+# name = value
+# Using default settings: "qpidd --help" or "man qpidd" for
more details.
+auth=no
+
diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 1ee8b48..9340e8b 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -83,6 +83,11 @@ file {"/etc/collectd.conf":
source => "puppet:///ovirt/collectd.conf"
}
+file {"/etc/qpidd.conf":
+ source => "puppet:///ovirt/qpidd.conf"
+ notify => Service["qpidd"]
+}
+
file {"/var/www/html/ovirt-cfgdb":
source => "puppet:///ovirt/ovirt-cfgdb"
}
@@ -109,6 +114,7 @@ firewall_rule {"nfsd": destination_port =>
'2049'}
firewall_rule {"rpcbind": destination_port => '111'}
firewall_rule {"rpcbind-udp": destination_port => '111',
protocol => 'udp'}
firewall_rule {"host-browser": destination_port =>
'12120'}
+firewall_rule {"qpidd": destination_port => '5672'}
firewall_rule {"rpc.mountd": destination_port => '892'}
firewall_rule {"rpc.mountd-udp": destination_port =>
'892', protocol => 'udp'}
firewall_rule {"rpc.statd": destination_port => '662'}
@@ -152,6 +158,11 @@ service {"nfslock":
require => [Service["network"]]
}
+service {"qpidd":
+ ensure => "running",
+ enable => true
+}
+
file {"/usr/sbin/ovirt-server-appliance-setup":
content => template("ovirt-server-appliance-setup.erb"),
mode => 755
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index c257e84..9fef6af 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -37,6 +37,10 @@ Requires: augeas
Requires: syslinux
Requires: lokkit
Requires: curl
+Requires: qpidd
+Requires: qpidc
+Requires: qmf
+Requires: python-qpid
%description
Thincrust oVirt Server Appliance Recipe
--
1.5.5.1