diff --git a/doc/source/asterisk.rst b/doc/source/asterisk.rst index 7bf57cb5c8..bb106b3ddf 100644 --- a/doc/source/asterisk.rst +++ b/doc/source/asterisk.rst @@ -11,7 +11,7 @@ At a Glance =========== :Hosts: - * http://pbx.openstack.org + * sip://pbx.opendev.org :Puppet: * https://git.openstack.org/cgit/openstack-infra/puppet-asterisk/tree/ * :cgit_file:`modules/openstack_project/manifests/pbx.pp` @@ -27,5 +27,5 @@ At a Glance Overview ======== -This is a CentOS 6 system that runs Asterisk, a telephony server. It is used -as a conferencing server for the OpenStack project. +This is a Ubuntu Xenial system that runs Asterisk, a telephony server. +It is used as a conferencing server for the OpenStack project. diff --git a/hiera/common.yaml b/hiera/common.yaml index 04b8c4221a..ec8ddef662 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -296,7 +296,7 @@ cacti_hosts: - ns2.opendev.org - openstackid.org - paste.openstack.org -- pbx.openstack.org +- pbx01.opendev.org - planet01.openstack.org - puppetmaster.openstack.org - mirror02.dfw.rax.openstack.org diff --git a/inventory/groups.yaml b/inventory/groups.yaml index 8e8d183716..dcea8b8961 100644 --- a/inventory/groups.yaml +++ b/inventory/groups.yaml @@ -61,7 +61,7 @@ groups: - nb[0-9]*.open*.org - nl[0-9]*.open*.org - paste[0-9]*.open*.org - - pbx*.open*.org + - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - review-dev[0-9]*.open*.org - review[0-9]*.open*.org @@ -124,7 +124,7 @@ groups: paste: - paste[0-9]*.open*.org pbx: - - pbx*.open*.org + - pbx[0-9]*.opendev.org puppet: - afs[0-9]*.open*.org - afsdb[0-9]*.open*.org @@ -159,7 +159,7 @@ groups: - openstackid.org - openstackid[0-9]*.openstack.org - paste[0-9]*.open*.org - - pbx*.open*.org + - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - refstack*.open*.org - review-dev[0-9]*.open*.org diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index bcc6a39011..5978127c0c 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -737,13 +737,6 @@ all: region_name: DFW public_v4: 23.253.235.223 public_v6: 2001:4800:7817:103:be76:4eff:fe05:176e - pbx.openstack.org: - ansible_host: 2001:4800:7817:103:be76:4eff:fe04:67a8 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 23.253.226.32 - public_v6: 2001:4800:7817:103:be76:4eff:fe04:67a8 pbx01.opendev.org: ansible_host: 2001:4800:7819:104:be76:4eff:fe04:b06f location: diff --git a/manifests/site.pp b/manifests/site.pp index b76317ca58..9ec0224e9e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1067,7 +1067,6 @@ node /^zm\d+.open.*\.org$/ { } } -# Node-OS: trusty # Node-OS: xenial node /^pbx\d*\.open.*\.org$/ { $group = "pbx"